src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp

*** 299,309 ****
      // initializer is being run so we emit a test which can be used to
      // check that this code is being executed by the initializing
      // thread.
      assert(_obj != noreg, "must be a valid register");
      assert(_oop_index >= 0, "must have oop index");
!     __ ld_ptr(_obj, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc), G3);
      __ cmp(G2_thread, G3);
      __ br(Assembler::notEqual, false, Assembler::pn, call_patch);
      __ delayed()->nop();
  
      // load_klass patches may execute the patched code before it's
--- 299,310 ----
      // initializer is being run so we emit a test which can be used to
      // check that this code is being executed by the initializing
      // thread.
      assert(_obj != noreg, "must be a valid register");
      assert(_oop_index >= 0, "must have oop index");
!     __ ld_ptr(_obj, java_lang_Class::klass_offset_in_bytes(), G3);
!     __ ld_ptr(G3, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc), G3);
      __ cmp(G2_thread, G3);
      __ br(Assembler::notEqual, false, Assembler::pn, call_patch);
      __ delayed()->nop();
  
      // load_klass patches may execute the patched code before it's