*** old/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp	Wed Dec  7 12:03:20 2011
--- new/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp	Wed Dec  7 12:03:20 2011

*** 300,310 ****
--- 300,310 ----
      // 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");
      __ load_heap_oop(_obj, java_lang_Class::klass_offset_in_bytes(), G3);
-     __ ld_ptr(G3, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc), G3);
      __ cmp_and_brx_short(G2_thread, G3, Assembler::notEqual, Assembler::pn, call_patch);
  
      // load_klass patches may execute the patched code before it's
      // copied back into place so we need to jump back into the main
      // code of the nmethod to continue execution.

*** 469,479 ****
--- 469,479 ----
    assert(tmp()->is_register(), "sanity");
    Register tmp_reg = tmp()->as_register();
  
    __ load_klass(src_reg, tmp_reg);
  
-   Address ref_type_adr(tmp_reg, instanceKlass::reference_type_offset_in_bytes() + sizeof(oopDesc));
    __ ld(ref_type_adr, tmp_reg);
  
    // _reference_type field is of type ReferenceType (enum)
    assert(REF_NONE == 0, "check this code");
    __ cmp_zero_and_br(Assembler::equal, tmp_reg, _continuation, /*annul*/false, Assembler::pt);