# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1363701027 -3600
# Node ID 2ee5508896f1b6d667aee98b76f1b7fa18e8d02e
# Parent  b8666670daf5fc24c48d09081a1a92ef8db62dbc# Parent  25691fcb505a408f350330aeafb15958f9d1cb52
Merge.

diff -r b8666670daf5 -r 2ee5508896f1 src/cpu/x86/vm/graalRuntime_x86.cpp
--- a/src/cpu/x86/vm/graalRuntime_x86.cpp	Tue Mar 19 14:23:46 2013 +0100
+++ b/src/cpu/x86/vm/graalRuntime_x86.cpp	Tue Mar 19 14:50:27 2013 +0100
@@ -100,7 +100,7 @@
     restore_live_registers(this, false);
     movptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD);
     leave();
-    movl(rscratch1, Deoptimization::make_trap_request(Deoptimization::Reason_constraint, Deoptimization::Action_reinterpret));
+    movl(Address(thread, ThreadShadow::pending_deoptimization_offset()), Deoptimization::make_trap_request(Deoptimization::Reason_constraint, Deoptimization::Action_reinterpret));
     jump(RuntimeAddress(SharedRuntime::deopt_blob()->uncommon_trap()));
     bind(L);
   }
diff -r b8666670daf5 -r 2ee5508896f1 src/cpu/x86/vm/sharedRuntime_x86_64.cpp
--- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Tue Mar 19 14:23:46 2013 +0100
+++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Tue Mar 19 14:50:27 2013 +0100
@@ -3419,7 +3419,7 @@
   __ set_last_Java_frame(noreg, noreg, NULL);
 
   __ movl(c_rarg1, Address(r15_thread, in_bytes(ThreadShadow::pending_deoptimization_offset())));
-  __ movl(Address(r15_thread, in_bytes(ThreadShadow::pending_deoptimization_offset())), 0);
+  __ movl(Address(r15_thread, in_bytes(ThreadShadow::pending_deoptimization_offset())), -1);
 
   __ movl(r14, (int32_t)Deoptimization::Unpack_reexecute);
   __ mov(c_rarg0, r15_thread);