src/cpu/x86/vm/c1_CodeStubs_x86.cpp

*** 318,328 ****
      __ push(tmp2);
      // Load without verification to keep code size small. We need it because
      // begin_initialized_entry_offset has to fit in a byte. Also, we know it's not null.
      __ load_heap_oop_not_null(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);
      __ pop(tmp);
      __ jcc(Assembler::notEqual, call_patch);
  
      // access_field patches may execute the patched code before it's
--- 318,328 ----
      __ push(tmp2);
      // Load without verification to keep code size small. We need it because
      // begin_initialized_entry_offset has to fit in a byte. Also, we know it's not null.
      __ load_heap_oop_not_null(tmp2, Address(_obj, java_lang_Class::klass_offset_in_bytes()));
      __ get_thread(tmp);
!     __ cmpptr(tmp, Address(tmp2, instanceKlass::init_thread_offset()));
      __ pop(tmp2);
      __ pop(tmp);
      __ jcc(Assembler::notEqual, call_patch);
  
      // access_field patches may execute the patched code before it's
*** 517,527 ****
    assert(tmp()->is_register(), "sanity");
    Register tmp_reg = tmp()->as_register();
  
    __ load_klass(tmp_reg, src_reg);
  
!   Address ref_type_adr(tmp_reg, instanceKlass::reference_type_offset_in_bytes() + sizeof(oopDesc));
    __ cmpl(ref_type_adr, REF_NONE);
    __ jcc(Assembler::equal, _continuation);
  
    // Is marking active?
    assert(thread()->is_register(), "precondition");
--- 517,527 ----
    assert(tmp()->is_register(), "sanity");
    Register tmp_reg = tmp()->as_register();
  
    __ load_klass(tmp_reg, src_reg);
  
!   Address ref_type_adr(tmp_reg, instanceKlass::reference_type_offset());
    __ cmpl(ref_type_adr, REF_NONE);
    __ jcc(Assembler::equal, _continuation);
  
    // Is marking active?
    assert(thread()->is_register(), "precondition");