src/hotspot/share/memory/metaspaceShared.hpp

*** 27,37 ****
  
  #include "classfile/compactHashtable.hpp"
  #include "memory/allocation.hpp"
  #include "memory/memRegion.hpp"
  #include "memory/virtualspace.hpp"
! #include "oops/oop.inline.hpp"
  #include "utilities/exceptions.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/resourceHash.hpp"
  
  #define MAX_SHARED_DELTA                (0x7FFFFFFF)
--- 27,37 ----
  
  #include "classfile/compactHashtable.hpp"
  #include "memory/allocation.hpp"
  #include "memory/memRegion.hpp"
  #include "memory/virtualspace.hpp"
! #include "oops/oop.hpp"
  #include "utilities/exceptions.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/resourceHash.hpp"
  
  #define MAX_SHARED_DELTA                (0x7FFFFFFF)
*** 94,109 ****
  #if INCLUDE_CDS_JAVA_HEAP
   private:
    static bool obj_equals(oop const& p1, oop const& p2) {
      return p1 == p2;
    }
!   static unsigned obj_hash(oop const& p) {
!     assert(!p->mark()->has_bias_pattern(),
!            "this object should never have been locked");  // so identity_hash won't safepoin
!     unsigned hash = (unsigned)p->identity_hash();
!     return hash;
!   }
    typedef ResourceHashtable<oop, oop,
        MetaspaceShared::obj_hash,
        MetaspaceShared::obj_equals,
        15889, // prime number
        ResourceObj::C_HEAP> ArchivedObjectCache;
--- 94,105 ----
  #if INCLUDE_CDS_JAVA_HEAP
   private:
    static bool obj_equals(oop const& p1, oop const& p2) {
      return p1 == p2;
    }
!   static unsigned obj_hash(oop const& p);
! 
    typedef ResourceHashtable<oop, oop,
        MetaspaceShared::obj_hash,
        MetaspaceShared::obj_equals,
        15889, // prime number
        ResourceObj::C_HEAP> ArchivedObjectCache;