src/hotspot/share/memory/metaspaceShared.cpp

*** 44,72 ****
  #include "interpreter/bytecodes.hpp"
  #include "logging/log.hpp"
  #include "logging/logMessage.hpp"
  #include "memory/filemap.hpp"
  #include "memory/metaspace.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/instanceClassLoaderKlass.hpp"
  #include "oops/instanceMirrorKlass.hpp"
  #include "oops/instanceRefKlass.hpp"
  #include "oops/objArrayKlass.hpp"
  #include "oops/objArrayOop.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/typeArrayKlass.hpp"
  #include "prims/jvmtiRedefineClasses.hpp"
! #include "runtime/timerTrace.hpp"
  #include "runtime/os.hpp"
  #include "runtime/signature.hpp"
  #include "runtime/vmThread.hpp"
  #include "runtime/vm_operations.hpp"
  #include "utilities/align.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/hashtable.inline.hpp"
- #include "memory/metaspaceClosure.hpp"
  
  ReservedSpace MetaspaceShared::_shared_rs;
  VirtualSpace MetaspaceShared::_shared_vs;
  MetaspaceSharedStats MetaspaceShared::_stats;
  bool MetaspaceShared::_has_error_classes;
--- 44,73 ----
  #include "interpreter/bytecodes.hpp"
  #include "logging/log.hpp"
  #include "logging/logMessage.hpp"
  #include "memory/filemap.hpp"
  #include "memory/metaspace.hpp"
+ #include "memory/metaspaceClosure.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/instanceClassLoaderKlass.hpp"
  #include "oops/instanceMirrorKlass.hpp"
  #include "oops/instanceRefKlass.hpp"
  #include "oops/objArrayKlass.hpp"
  #include "oops/objArrayOop.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/typeArrayKlass.hpp"
  #include "prims/jvmtiRedefineClasses.hpp"
! #include "runtime/handles.inline.hpp"
  #include "runtime/os.hpp"
  #include "runtime/signature.hpp"
+ #include "runtime/timerTrace.hpp"
  #include "runtime/vmThread.hpp"
  #include "runtime/vm_operations.hpp"
  #include "utilities/align.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/hashtable.inline.hpp"
  
  ReservedSpace MetaspaceShared::_shared_rs;
  VirtualSpace MetaspaceShared::_shared_vs;
  MetaspaceSharedStats MetaspaceShared::_stats;
  bool MetaspaceShared::_has_error_classes;
*** 1818,1827 ****
--- 1819,1835 ----
  
    G1CollectedHeap::heap()->end_archive_alloc_range(open_archive,
                                                     os::vm_allocation_granularity());
  }
  
+ unsigned MetaspaceShared::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;
+ }
+ 
  MetaspaceShared::ArchivedObjectCache* MetaspaceShared::_archive_object_cache = NULL;
  oop MetaspaceShared::find_archived_heap_object(oop obj) {
    assert(DumpSharedSpaces, "dump-time only");
    ArchivedObjectCache* cache = MetaspaceShared::archive_object_cache();
    oop* p = cache->get(obj);