src/hotspot/share/memory/universe.cpp

*** 83,95 ****
  #include "utilities/formatBuffer.hpp"
  #include "utilities/hashtable.inline.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/ostream.hpp"
  #include "utilities/preserveException.hpp"
- #if INCLUDE_CDS
- #include "classfile/sharedClassUtil.hpp"
- #endif
  
  // Known objects
  Klass* Universe::_boolArrayKlassObj                 = NULL;
  Klass* Universe::_byteArrayKlassObj                 = NULL;
  Klass* Universe::_charArrayKlassObj                 = NULL;
--- 83,92 ----
*** 1096,1106 ****
  
    MemoryService::add_metaspace_memory_pools();
  
    MemoryService::set_universe_heap(Universe::heap());
  #if INCLUDE_CDS
!   SharedClassUtil::initialize(CHECK_false);
  #endif
    return true;
  }
  
  
--- 1093,1103 ----
  
    MemoryService::add_metaspace_memory_pools();
  
    MemoryService::set_universe_heap(Universe::heap());
  #if INCLUDE_CDS
!   MetaspaceShared::post_initialize(CHECK_false);
  #endif
    return true;
  }