1.1 --- a/src/cpu/x86/vm/c1_CodeStubs_x86.cpp Tue Dec 20 00:55:02 2011 -0800
1.2 +++ b/src/cpu/x86/vm/c1_CodeStubs_x86.cpp Wed Dec 07 11:35:03 2011 +0100
1.3 @@ -320,7 +320,7 @@
1.4 // begin_initialized_entry_offset has to fit in a byte. Also, we know it's not null.
1.5 __ load_heap_oop_not_null(tmp2, Address(_obj, java_lang_Class::klass_offset_in_bytes()));
1.6 __ get_thread(tmp);
1.7 - __ cmpptr(tmp, Address(tmp2, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc)));
1.8 + __ cmpptr(tmp, Address(tmp2, instanceKlass::init_thread_offset()));
1.9 __ pop(tmp2);
1.10 __ pop(tmp);
1.11 __ jcc(Assembler::notEqual, call_patch);
1.12 @@ -519,7 +519,7 @@
1.13
1.14 __ load_klass(tmp_reg, src_reg);
1.15
1.16 - Address ref_type_adr(tmp_reg, instanceKlass::reference_type_offset_in_bytes() + sizeof(oopDesc));
1.17 + Address ref_type_adr(tmp_reg, instanceKlass::reference_type_offset());
1.18 __ cmpl(ref_type_adr, REF_NONE);
1.19 __ jcc(Assembler::equal, _continuation);
1.20
