--- old/src/share/vm/oops/klassVtable.cpp	2017-03-08 11:10:43.663561244 -0500
+++ new/src/share/vm/oops/klassVtable.cpp	2017-03-08 11:10:43.271373157 -0500
@@ -1563,7 +1563,6 @@
     no_klasses++;
     if (kl->is_instance_klass()) {
       no_instance_klasses++;
-      kl->array_klasses_do(do_class);
     }
     if (kl->is_array_klass()) {
       no_array_klasses++;
@@ -1573,7 +1572,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);