--- a/hotspot/src/share/vm/oops/klassVtable.cpp	Thu Jul 27 17:47:57 2017 -0700
+++ b/hotspot/src/share/vm/oops/klassVtable.cpp	Fri Jul 28 10:48:35 2017 -0400
@@ -1569,7 +1569,7 @@
   }
 
   static void compute() {
-    SystemDictionary::classes_do(do_class);
+    ClassLoaderDataGraph::classes_do(do_class);
     fixed  = no_klasses * oopSize;      // vtable length
     // filler size is a conservative approximation
     filler = oopSize * (no_klasses - no_instance_klasses) * (sizeof(InstanceKlass) - sizeof(ArrayKlass) - 1);