src/cpu/x86/vm/c1_CodeStubs_x86.cpp

*** 311,324 ****
      if (CommentedAssembly) {
        __ block_comment(" being_initialized check");
      }
      assert(_obj != noreg, "must be a valid register");
      Register tmp = rax;
!     if (_obj == tmp) tmp = rbx;
      __ push(tmp);
      __ get_thread(tmp);
!     __ cmpptr(tmp, Address(_obj, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc)));
      __ pop(tmp);
      __ jcc(Assembler::notEqual, call_patch);
  
      // access_field patches may execute the patched code before it's
      // copied back into place so we need to jump back into the main
--- 311,327 ----
      if (CommentedAssembly) {
        __ block_comment(" being_initialized check");
      }
      assert(_obj != noreg, "must be a valid register");
      Register tmp = rax;
!     Register tmp2 = rbx;
      __ push(tmp);
+     __ push(tmp2);
+     __ movptr(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
      // copied back into place so we need to jump back into the main