--- old/src/hotspot/share/memory/metaspaceShared.cpp	2018-10-02 09:20:27.758005937 -0700
+++ new/src/hotspot/share/memory/metaspaceShared.cpp	2018-10-02 09:20:27.437993675 -0700
@@ -419,13 +419,10 @@
   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);
+  // 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);
@@ -1835,7 +1832,7 @@
 
   {
     ArchiveCompactor::OtherROAllocMark mark;
-    HeapShared::create_hashtables();
+    HeapShared::write_subgraph_info_table();
   }
 }