src/hotspot/share/classfile/compactHashtable.inline.hpp

*** 26,36 ****
  #define SHARE_VM_CLASSFILE_COMPACTHASHTABLE_INLINE_HPP
  
  #include "classfile/compactHashtable.hpp"
  #include "classfile/javaClasses.hpp"
  #include "memory/allocation.inline.hpp"
! #include "oops/compressedOops.inline.hpp"
  #include "oops/oop.hpp"
  
  template <class T, class N>
  inline Symbol* CompactHashtable<T, N>::decode_entry(CompactHashtable<Symbol*, char>* const t,
                                                      u4 offset, const char* name, int len) {
--- 26,37 ----
  #define SHARE_VM_CLASSFILE_COMPACTHASHTABLE_INLINE_HPP
  
  #include "classfile/compactHashtable.hpp"
  #include "classfile/javaClasses.hpp"
  #include "memory/allocation.inline.hpp"
! #include "memory/filemap.hpp"
! #include "memory/heapShared.inline.hpp"
  #include "oops/oop.hpp"
  
  template <class T, class N>
  inline Symbol* CompactHashtable<T, N>::decode_entry(CompactHashtable<Symbol*, char>* const t,
                                                      u4 offset, const char* name, int len) {
*** 44,55 ****
  }
  
  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);
    if (java_lang_String::equals(string, (jchar*)name, len)) {
      return string;
    }
  
    return NULL;
--- 45,56 ----
  }
  
  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 v = (narrowOop)offset;
!   oop string = HeapShared::decode_not_null(v);
    if (java_lang_String::equals(string, (jchar*)name, len)) {
      return string;
    }
  
    return NULL;