src/hotspot/share/memory/metaspaceShared.cpp

*** 417,433 ****
  
    // Dump/restore references to commonly used names and signatures.
    vmSymbols::serialize(soc);
    soc->do_tag(--tag);
  
!   // Dump/restore the symbol and string tables
!   SymbolTable::serialize(soc);
!   StringTable::serialize(soc);
! 
!   // Dump/restore the tables related to shared heap objects
!   HeapShared::serialize_hashtables(soc);
!   soc->do_tag(--tag);
  
    JavaClasses::serialize_offsets(soc);
    InstanceMirrorKlass::serialize_offsets(soc);
    soc->do_tag(--tag);
  
--- 417,430 ----
  
    // Dump/restore references to commonly used names and signatures.
    vmSymbols::serialize(soc);
    soc->do_tag(--tag);
  
!   // Dump/restore the symbol/string/subgraph_info tables
!   SymbolTable::serialize_shared_table_header(soc);
!   StringTable::serialize_shared_table_header(soc);
!   HeapShared::serialize_subgraph_info_table_header(soc);
  
    JavaClasses::serialize_offsets(soc);
    InstanceMirrorKlass::serialize_offsets(soc);
    soc->do_tag(--tag);
  
*** 1833,1843 ****
  
    G1HeapVerifier::verify_archive_regions();
  
    {
      ArchiveCompactor::OtherROAllocMark mark;
!     HeapShared::create_hashtables();
    }
  }
  
  void VM_PopulateDumpSharedSpace::dump_archive_heap_oopmaps() {
    if (MetaspaceShared::is_heap_object_archiving_allowed()) {
--- 1830,1840 ----
  
    G1HeapVerifier::verify_archive_regions();
  
    {
      ArchiveCompactor::OtherROAllocMark mark;
!     HeapShared::write_subgraph_info_table();
    }
  }
  
  void VM_PopulateDumpSharedSpace::dump_archive_heap_oopmaps() {
    if (MetaspaceShared::is_heap_object_archiving_allowed()) {