Mercurial > hg > graal-compiler
changeset 20245:5a061b65b00b
Merge
author | morris |
---|---|
date | Wed, 06 Aug 2014 21:37:17 +0000 |
parents | d04cb4166be7 (current diff) e0c6fadce66e (diff) |
children | edfa5ba8609e |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/deoptimization.cpp Wed Aug 06 14:22:19 2014 -0700 +++ b/src/share/vm/runtime/deoptimization.cpp Wed Aug 06 21:37:17 2014 +0000 @@ -698,7 +698,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;