src/hotspot/cpu/x86/relocInfo_x86.cpp

*** 24,33 ****
--- 24,34 ----
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
  #include "code/relocInfo.hpp"
  #include "nativeInst_x86.hpp"
+ #include "oops/compressedOops.inline.hpp"
  #include "oops/klass.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/safepoint.hpp"
  #include "runtime/safepointMechanism.hpp"
  
*** 49,61 ****
    } else if (which == Assembler::narrow_oop_operand) {
      address disp = Assembler::locate_operand(addr(), which);
      // both compressed oops and compressed classes look the same
      if (Universe::heap()->is_in_reserved((oop)x)) {
      if (verify_only) {
!       guarantee(*(uint32_t*) disp == oopDesc::encode_heap_oop((oop)x), "instructions must match");
      } else {
!       *(int32_t*) disp = oopDesc::encode_heap_oop((oop)x);
      }
    } else {
        if (verify_only) {
          guarantee(*(uint32_t*) disp == Klass::encode_klass((Klass*)x), "instructions must match");
        } else {
--- 50,62 ----
    } else if (which == Assembler::narrow_oop_operand) {
      address disp = Assembler::locate_operand(addr(), which);
      // both compressed oops and compressed classes look the same
      if (Universe::heap()->is_in_reserved((oop)x)) {
      if (verify_only) {
!       guarantee(*(uint32_t*) disp == CompressedOops::encode((oop)x), "instructions must match");
      } else {
!       *(int32_t*) disp = CompressedOops::encode((oop)x);
      }
    } else {
        if (verify_only) {
          guarantee(*(uint32_t*) disp == Klass::encode_klass((Klass*)x), "instructions must match");
        } else {