# HG changeset patch
# User kvn
# Date 1406669289 0
# Node ID 3e0e9399c3ac855153934d7856a93c384989bfff
# Parent  d4e4f72b49fcb931084ed066f32aac0181b51f32# Parent  6f9fa66be5df465fcb6068a8e69b4bfa8fb5f11d
Merge

diff -r d4e4f72b49fc -r 3e0e9399c3ac hotspot/src/share/vm/runtime/deoptimization.cpp
--- 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;