src/hotspot/cpu/sparc/relocInfo_sparc.cpp

*** 24,35 ****
  
  #include "precompiled.hpp"
  #include "asm/assembler.hpp"
  #include "code/relocInfo.hpp"
  #include "nativeInst_sparc.hpp"
  #include "oops/klass.inline.hpp"
! #include "oops/oop.inline.hpp"
  #include "runtime/safepoint.hpp"
  
  void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
    NativeInstruction* ip = nativeInstruction_at(addr());
    jint inst = ip->long_at(0);
--- 24,36 ----
  
  #include "precompiled.hpp"
  #include "asm/assembler.hpp"
  #include "code/relocInfo.hpp"
  #include "nativeInst_sparc.hpp"
+ #include "oops/compressedOops.inline.hpp"
  #include "oops/klass.inline.hpp"
! #include "oops/oop.hpp"
  #include "runtime/safepoint.hpp"
  
  void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
    NativeInstruction* ip = nativeInstruction_at(addr());
    jint inst = ip->long_at(0);
*** 95,105 ****
      {
      jint inst2;
      guarantee(Assembler::inv_op2(inst)==Assembler::sethi_op2, "must be sethi");
      if (format() != 0) {
        assert(type() == relocInfo::oop_type || type() == relocInfo::metadata_type, "only narrow oops or klasses case");
!       jint np = type() == relocInfo::oop_type ? oopDesc::encode_heap_oop((oop)x) : Klass::encode_klass((Klass*)x);
        inst &= ~Assembler::hi22(-1);
        inst |=  Assembler::hi22((intptr_t)np);
        if (verify_only) {
          guarantee(ip->long_at(0) == inst, "instructions must match");
        } else {
--- 96,106 ----
      {
      jint inst2;
      guarantee(Assembler::inv_op2(inst)==Assembler::sethi_op2, "must be sethi");
      if (format() != 0) {
        assert(type() == relocInfo::oop_type || type() == relocInfo::metadata_type, "only narrow oops or klasses case");
!       jint np = type() == relocInfo::oop_type ? CompressedOops::encode((oop)x) : Klass::encode_klass((Klass*)x);
        inst &= ~Assembler::hi22(-1);
        inst |=  Assembler::hi22((intptr_t)np);
        if (verify_only) {
          guarantee(ip->long_at(0) == inst, "instructions must match");
        } else {