OpenJDK / jdk / jdk10
changeset 25921:3e0e9399c3ac
Merge
| author | kvn |
|---|---|
| date | Tue, 29 Jul 2014 21:28:09 +0000 |
| parents | d4e4f72b49fc 6f9fa66be5df |
| children | 2967d086df71 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp Tue Jul 29 13:56:29 2014 +0200 +++ b/hotspot/src/share/vm/runtime/deoptimization.cpp Tue Jul 29 21:28:09 2014 +0000 @@ -661,7 +661,7 @@ (iframe->interpreter_frame_expression_stack_size() == (next_mask_expression_stack_size - top_frame_expression_stack_adjustment))) || (is_top_frame && (exec_mode == Unpack_exception) && iframe->interpreter_frame_expression_stack_size() == 0) || - (is_top_frame && (exec_mode == Unpack_uncommon_trap || exec_mode == Unpack_reexecute) && + (is_top_frame && (exec_mode == Unpack_uncommon_trap || exec_mode == Unpack_reexecute || el->should_reexecute()) && (iframe->interpreter_frame_expression_stack_size() == mask.expression_stack_size() + cur_invoke_parameter_size)) )) { ttyLocker ttyl;