Mercurial > hg > openjdk > hsx14

changeset 536:1ddf2a5238c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author phh
date Tue, 07 Apr 2009 20:15:25 -0700
parents 3b198a510480 (current diff) 081e91e3e8f3 (diff)
children e86b9903f42e
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Tue Apr 07 17:39:17 2009 -0700
+++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Tue Apr 07 20:15:25 2009 -0700
@@ -2689,7 +2689,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