# HG changeset patch
# User morris
# Date 1407361037 0
# Node ID 5a061b65b00b58e413f9c421433242e402cd33ef
# Parent  d04cb4166be7d96bf3b39a463fb1303336c36d1c# Parent  e0c6fadce66e7f6535848d238e2c567678447007
Merge

diff -r d04cb4166be7 -r 5a061b65b00b src/share/vm/runtime/deoptimization.cpp
--- 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;