--- old/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp 2011-12-07 12:03:21.000000000 +0100 +++ new/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp 2011-12-07 12:03:20.000000000 +0100 @@ -181,7 +181,7 @@ void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register t1, Register t2) { assert_different_registers(obj, klass, len, t1, t2); if (UseBiasedLocking && !len->is_valid()) { - ld_ptr(klass, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes(), t1); + ld_ptr(klass, Klass::prototype_header_offset_in_bytes(), t1); } else { set((intx)markOopDesc::prototype(), t1); } @@ -252,7 +252,7 @@ #ifdef ASSERT { Label ok; - ld(klass, klassOopDesc::header_size() * HeapWordSize + Klass::layout_helper_offset_in_bytes(), t1); + ld(klass, Klass::layout_helper_offset_in_bytes(), t1); if (var_size_in_bytes != noreg) { cmp_and_brx_short(t1, var_size_in_bytes, Assembler::equal, Assembler::pt, ok); } else {