src/hotspot/share/oops/instanceKlass.cpp

@@ -283,10 +283,13 @@
   // Orphan the mirror first, CMS thinks it's still live.
   if (java_mirror() != NULL) {
     java_lang_Class::set_klass(java_mirror(), NULL);
   }
 
+  // Also remove mirror from handles
+  loader_data->remove_handle(_java_mirror);
+
   // Need to take this class off the class loader data list.
   loader_data->remove_class(this);
 
   // The array_klass for this class is created later, after error handling.
   // For class redefinition, we keep the original class so this scratch class