# HG changeset patch
# User never
# Date 1238552434 25200
# Node ID 90e3155a713da5b3622b0133779fdb3814bc12c3
# Parent  69aefafe69c1b5af8c30a6c40a59d504c7e5a6fe# Parent  fbde8ec322d0b3822b382c881e089f3a1760ad1e
Merge

diff -r fbde8ec322d0 -r 90e3155a713d src/cpu/x86/vm/sharedRuntime_x86_64.cpp
--- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Tue Mar 31 14:07:08 2009 -0700
+++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Tue Mar 31 19:20:34 2009 -0700
@@ -2691,7 +2691,7 @@
   __ mov(rdi, rax);
 
    Label noException;
-  __ cmpl(r12, Deoptimization::Unpack_exception);   // Was exception pending?
+  __ cmpl(r14, Deoptimization::Unpack_exception);   // Was exception pending?
   __ jcc(Assembler::notEqual, noException);
   __ movptr(rax, Address(r15_thread, JavaThread::exception_oop_offset()));
   // QQQ this is useless it was NULL above