src/hotspot/share/memory/metaspaceShared.hpp

@@ -77,10 +77,11 @@
     num_non_heap_spaces = od + 1,
 
     // mapped java heap regions
     first_string = od + 1, // index of first string region
     max_strings = 2, // max number of string regions in string space
+    last_string = first_string + max_strings - 1,
     first_open_archive_heap_region = first_string + max_strings,
     max_open_archive_heap_region = 2,
 
     last_valid_region = first_open_archive_heap_region + max_open_archive_heap_region - 1,
     n_regions =  last_valid_region + 1 // total number of regions

@@ -109,11 +110,11 @@
   static ArchivedObjectCache* archive_object_cache() {
     return _archive_object_cache;
   }
   static oop find_archived_heap_object(oop obj);
   static oop archive_heap_object(oop obj, Thread* THREAD);
-  static oop materialize_archived_object(oop obj);
+  static oop materialize_archived_object(narrowOop v);
   static void archive_klass_objects(Thread* THREAD);
 #endif
 
   static bool is_archive_object(oop p) NOT_CDS_JAVA_HEAP_RETURN_(false);
 

@@ -219,12 +220,10 @@
   static bool remapped_readwrite() {
     CDS_ONLY(return _remapped_readwrite);
     NOT_CDS(return false);
   }
 
-  static void print_shared_spaces();
-
   static bool try_link_class(InstanceKlass* ik, TRAPS);
   static void link_and_cleanup_shared_classes(TRAPS);
   static void check_shared_class_loader_type(InstanceKlass* ik);
 
   // Allocate a block of memory from the "mc", "ro", or "rw" regions.