ppc

src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp

@@ -47,15 +47,6 @@ void C2_MacroAssembler::fast_unlock_lightweight(ConditionRegister flag, Register
   compiler_fast_unlock_lightweight_object(flag, obj, box, tmp1, tmp2, tmp3);
 }
 
-void C2_MacroAssembler::load_narrow_klass_compact_c2(Register dst, Register obj, int disp) {
-  // Note: Don't clobber obj anywhere in that method!
-
-  // The incoming address is pointing into obj-start + klass_offset_in_bytes. We need to extract
-  // obj-start, so that we can load from the object's mark-word instead.
-  ld(dst, disp - oopDesc::klass_offset_in_bytes(), obj);
-  srdi(dst, dst, markWord::klass_shift);
-}
-
 // Intrinsics for CompactStrings
 
 // Compress char[] to byte[] by compressing 16 bytes at once.

src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp

@@ -34,8 +34,6 @@
   void fast_unlock_lightweight(ConditionRegister flag, Register obj, Register box,
                                Register tmp1, Register tmp2, Register tmp3);
 
-  void load_narrow_klass_compact_c2(Register dst, Register obj, int disp);
-
   // Intrinsics for CompactStrings
   // Compress char[] to byte[] by compressing 16 bytes at once.
   void string_compress_16(Register src, Register dst, Register cnt,

src/hotspot/cpu/ppc/ppc.ad

@@ -5515,6 +5515,8 @@ instruct loadNKlassCompactHeaders(iRegNdst dst, memory mem) %{
   ins_encode %{
     assert($mem$$index$$Register == R0, "must not have indexed address: %s[%s]", $mem$$base$$Register.name(), $mem$$index$$Register.name());
     __ load_narrow_klass_compact_c2($dst$$Register, $mem$$base$$Register, $mem$$disp);
+    __ lwz($dst$$Register, $mem$$Address);
+    __ srdi($dst$$Register, $dst$$Register, markWord::klass_shift_at_offset);
   %}
   ins_pipe(pipe_class_memory);
 %}