Mercurial > hg > truffle

diff src/cpu/x86/vm/c1_LIRAssembler_x86.cpp @ 12269:da051ce490eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author adlertz
date Thu, 19 Sep 2013 18:01:39 +0200
parents 7944aba7ba41 2795dff62b6c
children d13d7aba8c12
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Thu Sep 19 09:34:20 2013 +0200
+++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Thu Sep 19 18:01:39 2013 +0200
@@ -1724,14 +1724,6 @@
   }
 
   assert_different_registers(obj, k_RInfo, klass_RInfo);
-  if (!k->is_loaded()) {
-    klass2reg_with_patching(k_RInfo, op->info_for_patch());
-  } else {
-#ifdef _LP64
-    __ mov_metadata(k_RInfo, k->constant_encoding());
-#endif // _LP64
-  }
-  assert(obj != k_RInfo, "must be different");
 
   __ cmpptr(obj, (int32_t)NULL_WORD);
   if (op->should_profile()) {
@@ -1748,6 +1740,14 @@
   } else {
     __ jcc(Assembler::equal, *obj_is_null);
   }
+
+  if (!k->is_loaded()) {
+    klass2reg_with_patching(k_RInfo, op->info_for_patch());
+  } else {
+#ifdef _LP64
+    __ mov_metadata(k_RInfo, k->constant_encoding());
+#endif // _LP64
+  }
   __ verify_oop(obj);
 
   if (op->fast_check()) {