Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
8049252: VerifyStack logic in Deoptimization::unpack_frames does not expect to see invoke bc at the top frame during normal deoptimization
Thu, 29 Sep 2016 09:54:38 +0800
- author
- aoqi
- date
- Thu, 29 Sep 2016 09:54:38 +0800
- changeset 123
- c7fdbe297c7c
- parent 122
- 6d57f54d4a92
- child 124
- 9d7e35a93fad
8049252: VerifyStack logic in Deoptimization::unpack_frames does not expect to see invoke bc at the top frame during normal deoptimization
see: http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/e0c6fadce66e
| src/share/vm/runtime/deoptimization.cpp | file | annotate | diff | comparison | revisions |
1.1 --- a/src/share/vm/runtime/deoptimization.cpp Mon Sep 26 16:01:19 2016 -0400 1.2 +++ b/src/share/vm/runtime/deoptimization.cpp Thu Sep 29 09:54:38 2016 +0800 1.3 @@ -710,7 +710,7 @@ 1.4 (iframe->interpreter_frame_expression_stack_size() == (next_mask_expression_stack_size - 1.5 top_frame_expression_stack_adjustment))) || 1.6 (is_top_frame && (exec_mode == Unpack_exception) && iframe->interpreter_frame_expression_stack_size() == 0) || 1.7 - (is_top_frame && (exec_mode == Unpack_uncommon_trap || exec_mode == Unpack_reexecute) && 1.8 + (is_top_frame && (exec_mode == Unpack_uncommon_trap || exec_mode == Unpack_reexecute || el->should_reexecute()) && 1.9 (iframe->interpreter_frame_expression_stack_size() == mask.expression_stack_size() + cur_invoke_parameter_size)) 1.10 )) { 1.11 ttyLocker ttyl;
