Mercurial > hg > truffle

diff src/cpu/x86/vm/sharedRuntime_x86_64.cpp @ 686:a9d9d7e06593

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Thu, 02 Apr 2009 17:01:00 -0700
parents 69aefafe69c1
children fe95187e8882
line wrap: on
line diff
--- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Wed Apr 01 22:31:26 2009 -0700
+++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Thu Apr 02 17:01:00 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