src/hotspot/cpu/ppc/relocInfo_ppc.cpp

@@ -25,12 +25,13 @@
 
 #include "precompiled.hpp"
 #include "asm/assembler.inline.hpp"
 #include "code/relocInfo.hpp"
 #include "nativeInst_ppc.hpp"
+#include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
-#include "oops/oop.inline.hpp"
+#include "oops/oop.hpp"
 #include "runtime/safepoint.hpp"
 
 void Relocation::pd_set_data_value(address x, intptr_t o, bool verify_only) {
   // The following comment is from the declaration of DataRelocation:
   //

@@ -55,11 +56,11 @@
       nativeMovConstReg_at(addr())->set_data_plain(((intptr_t)x), code());
     } else {
       assert(type() == relocInfo::oop_type || type() == relocInfo::metadata_type,
              "how to encode else?");
       narrowOop no = (type() == relocInfo::oop_type) ?
-        oopDesc::encode_heap_oop((oop)x) : Klass::encode_klass((Klass*)x);
+          CompressedOops::encode((oop)x) : Klass::encode_klass((Klass*)x);
       nativeMovConstReg_at(addr())->set_narrow_oop(no, code());
     }
   } else {
     guarantee((address) (nativeMovConstReg_at(addr())->data()) == x, "data must match");
   }