--- a/src/hotspot/share/classfile/dictionary.cpp	Sat Aug 25 14:23:21 2018 +0200
+++ b/src/hotspot/share/classfile/dictionary.cpp	Sat Aug 25 11:10:21 2018 -0400
@@ -330,13 +330,13 @@
 }
 
 // All classes, and their class loaders, including initiating class loaders
-void Dictionary::all_entries_do(void f(InstanceKlass*, ClassLoaderData*)) {
+void Dictionary::all_entries_do(KlassClosure* closure) {
   for (int index = 0; index < table_size(); index++) {
     for (DictionaryEntry* probe = bucket(index);
                           probe != NULL;
                           probe = probe->next()) {
       InstanceKlass* k = probe->instance_klass();
-      f(k, loader_data());
+      closure->do_klass(k);
     }
   }
 }