Mercurial > hg > truffle

changeset 683:90e3155a713d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author never
date Tue, 31 Mar 2009 19:20:34 -0700
parents 69aefafe69c1 (diff) fbde8ec322d0 (current diff)
children 7230de7c4610
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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