Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/deoptimization.cpp @ 20243:e0c6fadce66e
8049252: VerifyStack logic in Deoptimization::unpack_frames does not expect to see invoke bc at the top frame during normal deoptimization
Summary: Add missing check for reexecute flag to VerifyStack code.
Reviewed-by: roland
author | kvn |
---|---|
date | Tue, 29 Jul 2014 13:40:58 -0700 |
parents | 0bf37f737702 |
children | f6f9aec27858 |
comparison
equal
deleted
inserted
replaced
20242:d14a18794c90 | 20243:e0c6fadce66e |
---|---|
696 (iframe->interpreter_frame_expression_stack_size() == mask.expression_stack_size() + callee_max_locals) || | 696 (iframe->interpreter_frame_expression_stack_size() == mask.expression_stack_size() + callee_max_locals) || |
697 (try_next_mask && | 697 (try_next_mask && |
698 (iframe->interpreter_frame_expression_stack_size() == (next_mask_expression_stack_size - | 698 (iframe->interpreter_frame_expression_stack_size() == (next_mask_expression_stack_size - |
699 top_frame_expression_stack_adjustment))) || | 699 top_frame_expression_stack_adjustment))) || |
700 (is_top_frame && (exec_mode == Unpack_exception) && iframe->interpreter_frame_expression_stack_size() == 0) || | 700 (is_top_frame && (exec_mode == Unpack_exception) && iframe->interpreter_frame_expression_stack_size() == 0) || |
701 (is_top_frame && (exec_mode == Unpack_uncommon_trap || exec_mode == Unpack_reexecute) && | 701 (is_top_frame && (exec_mode == Unpack_uncommon_trap || exec_mode == Unpack_reexecute || el->should_reexecute()) && |
702 (iframe->interpreter_frame_expression_stack_size() == mask.expression_stack_size() + cur_invoke_parameter_size)) | 702 (iframe->interpreter_frame_expression_stack_size() == mask.expression_stack_size() + cur_invoke_parameter_size)) |
703 )) { | 703 )) { |
704 ttyLocker ttyl; | 704 ttyLocker ttyl; |
705 | 705 |
706 // Print out some information that will help us debug the problem | 706 // Print out some information that will help us debug the problem |