--- old/src/hotspot/share/classfile/compactHashtable.inline.hpp	2018-08-01 22:33:55.959696381 -0700
+++ new/src/hotspot/share/classfile/compactHashtable.inline.hpp	2018-08-01 22:33:55.631683907 -0700
@@ -28,7 +28,8 @@
 #include "classfile/compactHashtable.hpp"
 #include "classfile/javaClasses.hpp"
 #include "memory/allocation.inline.hpp"
-#include "oops/compressedOops.inline.hpp"
+#include "memory/filemap.hpp"
+#include "memory/heapShared.inline.hpp"
 #include "oops/oop.hpp"
 
 template <class T, class N>
@@ -46,8 +47,8 @@
 template <class T, class N>
 inline oop CompactHashtable<T, N>::decode_entry(CompactHashtable<oop, char>* const t,
                                                 u4 offset, const char* name, int len) {
-  narrowOop obj = (narrowOop)offset;
-  oop string = CompressedOops::decode(obj);
+  narrowOop v = (narrowOop)offset;
+  oop string = HeapShared::decode_not_null(v);
   if (java_lang_String::equals(string, (jchar*)name, len)) {
     return string;
   }