--- a/hotspot/src/share/vm/memory/universe.cpp	Thu Jul 27 17:47:57 2017 -0700
+++ b/hotspot/src/share/vm/memory/universe.cpp	Fri Jul 28 10:48:35 2017 -0400
@@ -548,14 +548,13 @@
 }
 
 
-void initialize_itable_for_klass(Klass* k, TRAPS) {
-  InstanceKlass::cast(k)->itable().initialize_itable(false, CHECK);
+void initialize_itable_for_klass(InstanceKlass* k, TRAPS) {
+  k->itable().initialize_itable(false, CHECK);
 }
 
 
 void Universe::reinitialize_itables(TRAPS) {
-  SystemDictionary::classes_do(initialize_itable_for_klass, CHECK);
-
+  ClassLoaderDataGraph::dictionary_classes_do(initialize_itable_for_klass, CHECK);
 }