src/hotspot/share/code/relocInfo.cpp

*** 26,35 ****
--- 26,36 ----
  #include "code/codeCache.hpp"
  #include "code/compiledIC.hpp"
  #include "code/nmethod.hpp"
  #include "code/relocInfo.hpp"
  #include "memory/resourceArea.hpp"
+ #include "oops/compressedOops.inline.hpp"
  #include "runtime/stubCodeGenerator.hpp"
  #include "utilities/copy.hpp"
  #include "oops/oop.inline.hpp"
  
  const RelocationHolder RelocationHolder::none; // its type is relocInfo::none
*** 305,315 ****
  }
  
  void Relocation::const_set_data_value(address x) {
  #ifdef _LP64
    if (format() == relocInfo::narrow_oop_in_const) {
!     *(narrowOop*)addr() = oopDesc::encode_heap_oop((oop) x);
    } else {
  #endif
      *(address*)addr() = x;
  #ifdef _LP64
    }
--- 306,316 ----
  }
  
  void Relocation::const_set_data_value(address x) {
  #ifdef _LP64
    if (format() == relocInfo::narrow_oop_in_const) {
!     *(narrowOop*)addr() = CompressedOops::encode((oop) x);
    } else {
  #endif
      *(address*)addr() = x;
  #ifdef _LP64
    }
*** 317,327 ****
  }
  
  void Relocation::const_verify_data_value(address x) {
  #ifdef _LP64
    if (format() == relocInfo::narrow_oop_in_const) {
!     guarantee(*(narrowOop*)addr() == oopDesc::encode_heap_oop((oop) x), "must agree");
    } else {
  #endif
      guarantee(*(address*)addr() == x, "must agree");
  #ifdef _LP64
    }
--- 318,328 ----
  }
  
  void Relocation::const_verify_data_value(address x) {
  #ifdef _LP64
    if (format() == relocInfo::narrow_oop_in_const) {
!     guarantee(*(narrowOop*)addr() == CompressedOops::encode((oop) x), "must agree");
    } else {
  #endif
      guarantee(*(address*)addr() == x, "must agree");
  #ifdef _LP64
    }