src/share/vm/classfile/systemDictionary.hpp

@@ -354,11 +354,13 @@
   // Added for initialize_itable_for_klass to handle exceptions
   static void classes_do(void f(Klass*, TRAPS), TRAPS);
   // All classes, and their class loaders, including initiating class loaders
   static void classes_do(void f(Klass*, ClassLoaderData*));
 
+  static void classes_do(MetaspaceClosure* it);
   // Iterate over all methods in all klasses
+
   static void methods_do(void f(Method*));
 
   // Garbage collection support
 
   // This method applies "blk->do_oop" to all the pointers to "system"

@@ -383,13 +385,15 @@
   // System loader lock
   static oop system_loader_lock()           { return _system_loader_lock_obj; }
 
 public:
   // Sharing support.
-  static void reorder_dictionary();
-  static void copy_buckets(char** top, char* end);
-  static void copy_table(char** top, char* end);
+  static void reorder_dictionary_for_sharing();
+  static size_t count_bytes_for_buckets();
+  static size_t count_bytes_for_table();
+  static void copy_buckets(char* top, char* end);
+  static void copy_table(char* top, char* end);
   static void set_shared_dictionary(HashtableBucket<mtClass>* t, int length,
                                     int number_of_entries);
   // Printing
   static void print(bool details = true);
   static void print_shared(bool details = true);

@@ -446,10 +450,11 @@
 
   static InstanceKlass** well_known_klass_addr(WKID id) {
     assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob");
     return &_well_known_klasses[id];
   }
+  static void well_known_klasses_do(MetaspaceClosure* it);
 
   // Local definition for direct access to the private array:
   #define WK_KLASS(name) _well_known_klasses[SystemDictionary::WK_KLASS_ENUM_NAME(name)]
 
   static InstanceKlass* box_klass(BasicType t) {