src/hotspot/share/classfile/classLoaderData.cpp

@@ -638,12 +638,12 @@
     if (k->is_array_klass()) {
       _array_class_released ++;
     } else {
       assert(k->is_instance_klass(), "Must be");
       _instance_class_released ++;
-      InstanceKlass::release_C_heap_structures(InstanceKlass::cast(k));
     }
+    k->release_C_heap_structures();
   }
 };
 
 ClassLoaderData::~ClassLoaderData() {
   // Release C heap structures for all the classes.

@@ -867,11 +867,11 @@
     if (m->is_constantPool()) {
       ((ConstantPool*)m)->release_C_heap_structures();
     } else if (m->is_klass()) {
       InstanceKlass* ik = (InstanceKlass*)m;
       // also releases ik->constants() C heap memory
-      InstanceKlass::release_C_heap_structures(ik);
+      ik->release_C_heap_structures();
       // Remove the class so unloading events aren't triggered for
       // this class (scratch or error class) in do_unloading().
       remove_class(ik);
     }
   }