--- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp Tue Mar 22 13:36:33 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp Wed Mar 23 10:55:43 2011 -0700
@@ -316,7 +316,7 @@
Register tmp2 = rbx;
__ push(tmp);
__ push(tmp2);
- __ movptr(tmp2, Address(_obj, java_lang_Class::klass_offset_in_bytes()));
+ __ load_heap_oop(tmp2, Address(_obj, java_lang_Class::klass_offset_in_bytes()));
__ get_thread(tmp);
__ cmpptr(tmp, Address(tmp2, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc)));
__ pop(tmp2);