--- a/hotspot/src/share/vm/classfile/dictionary.hpp	Sat Jul 22 15:54:27 2017 -0400
+++ b/hotspot/src/share/vm/classfile/dictionary.hpp	Wed Aug 02 18:06:38 2017 -0700
@@ -84,6 +84,7 @@
   void classes_do(void f(InstanceKlass*));
   void classes_do(void f(InstanceKlass*, TRAPS), TRAPS);
   void all_entries_do(void f(InstanceKlass*, ClassLoaderData*));
+  void classes_do(MetaspaceClosure* it);
 
   void unlink(BoolObjectClosure* is_alive);
   void remove_classes_in_error_state();
@@ -101,7 +102,7 @@
                              Handle protection_domain, TRAPS);
 
   // Sharing support
-  void reorder_dictionary();
+  void reorder_dictionary_for_sharing();
 
   void print_on(outputStream* st) const;
   void verify();
@@ -142,6 +143,7 @@
   void add_protection_domain(Dictionary* dict, Handle protection_domain);
 
   InstanceKlass* instance_klass() const { return literal(); }
+  InstanceKlass** klass_addr() { return (InstanceKlass**)literal_addr(); }
 
   DictionaryEntry* next() const {
     return (DictionaryEntry*)HashtableEntry<InstanceKlass*, mtClass>::next();
@@ -300,9 +302,6 @@
 
   void methods_do(void f(Method*));
 
-  // Sharing support
-  void reorder_dictionary();
-
   void verify();
 };
 #endif // SHARE_VM_CLASSFILE_DICTIONARY_HPP