diff -r 7e78be444e68 -r 32161fbea3fe src/hotspot/share/classfile/classLoaderData.cpp
--- a/src/hotspot/share/classfile/classLoaderData.cpp	Tue Sep 25 21:33:51 2018 -0700
+++ b/src/hotspot/share/classfile/classLoaderData.cpp	Wed Sep 26 14:01:48 2018 -0400
@@ -605,9 +605,10 @@
   // if they are not already on the _klasses list.
   free_deallocate_list_C_heap_structures();
 
-  // Tell serviceability tools these classes are unloading
+  // Clean up class dependencies and tell serviceability tools
+  // these classes are unloading.  Must be called
   // after erroneous classes are released.
-  classes_do(InstanceKlass::notify_unload_class);
+  classes_do(InstanceKlass::unload_class);
 
   // Clean up global class iterator for compiler
   static_klass_iterator.adjust_saved_class(this);