src/hotspot/cpu/x86/macroAssembler_x86.cpp

*** 5134,12 ***
    movptr(holder, Address(holder, ConstantPool::pool_holder_offset()));          // InstanceKlass*
  }
  
  void MacroAssembler::load_narrow_klass_compact(Register dst, Register src) {
    assert(UseCompactObjectHeaders, "expect compact object headers");
!   movq(dst, Address(src, oopDesc::mark_offset_in_bytes()));
!   shrq(dst, markWord::klass_shift);
  }
  
  void MacroAssembler::load_klass(Register dst, Register src, Register tmp) {
    assert_different_registers(src, tmp);
    assert_different_registers(dst, tmp);
--- 5134,12 ---
    movptr(holder, Address(holder, ConstantPool::pool_holder_offset()));          // InstanceKlass*
  }
  
  void MacroAssembler::load_narrow_klass_compact(Register dst, Register src) {
    assert(UseCompactObjectHeaders, "expect compact object headers");
!   movl(dst, Address(src, oopDesc::mark_offset_in_bytes()));
!   shrl(dst, markWord::klass_shift);
  }
  
  void MacroAssembler::load_klass(Register dst, Register src, Register tmp) {
    assert_different_registers(src, tmp);
    assert_different_registers(dst, tmp);