--- a/hotspot/src/share/vm/oops/klass.cpp	Tue Oct 20 11:17:19 2015 -0400
+++ b/hotspot/src/share/vm/oops/klass.cpp	Tue Oct 13 10:06:46 2015 +0200
@@ -442,8 +442,7 @@
     // Clean the implementors list and method data.
     if (clean_alive_klasses && current->oop_is_instance()) {
       InstanceKlass* ik = InstanceKlass::cast(current);
-      ik->clean_implementors_list(is_alive);
-      ik->clean_method_data(is_alive);
+      ik->clean_weak_instanceklass_links(is_alive);
     }
   }
 }