--- a/hotspot/src/share/vm/classfile/systemDictionary.hpp	Fri May 26 13:47:33 2017 -0700
+++ b/hotspot/src/share/vm/classfile/systemDictionary.hpp	Sat May 27 09:21:01 2017 -0400
@@ -78,6 +78,7 @@
 template <MEMFLAGS F> class HashtableBucket;
 class ResolutionErrorTable;
 class SymbolPropertyTable;
+class GCTimer;
 
 // Certain classes are preloaded, such as java.lang.Object and java.lang.String.
 // They are all "well-known", in the sense that no class loader is allowed
@@ -155,6 +156,7 @@
   do_klass(MethodHandle_klass,                          java_lang_invoke_MethodHandle,             Pre                 ) \
   do_klass(VarHandle_klass,                             java_lang_invoke_VarHandle,                Pre                 ) \
   do_klass(MemberName_klass,                            java_lang_invoke_MemberName,               Pre                 ) \
+  do_klass(ResolvedMethodName_klass,                    java_lang_invoke_ResolvedMethodName,       Pre                 ) \
   do_klass(MethodHandleNatives_klass,                   java_lang_invoke_MethodHandleNatives,      Pre                 ) \
   do_klass(LambdaForm_klass,                            java_lang_invoke_LambdaForm,               Opt                 ) \
   do_klass(MethodType_klass,                            java_lang_invoke_MethodType,               Pre                 ) \
@@ -366,7 +368,8 @@
   // Unload (that is, break root links to) all unmarked classes and
   // loaders.  Returns "true" iff something was unloaded.
   static bool do_unloading(BoolObjectClosure* is_alive,
-                           bool clean_previous_versions = true);
+                           GCTimer* gc_timer,
+                           bool do_cleaning = true);
 
   // Used by DumpSharedSpaces only to remove classes that failed verification
   static void remove_classes_in_error_state();