--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp	Mon Jul 07 10:12:40 2014 +0200
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp	Mon Jul 07 12:37:11 2014 +0200
@@ -1612,7 +1612,13 @@
 // system dictionary and follows the remaining classes' contents.
 
 void SystemDictionary::always_strong_oops_do(OopClosure* blk) {
-  roots_oops_do(blk, NULL);
+  blk->do_oop(&_java_system_loader);
+  blk->do_oop(&_system_loader_lock_obj);
+
+  dictionary()->always_strong_oops_do(blk);
+
+  // Visit extra methods
+  invoke_method_table()->oops_do(blk);
 }
 
 void SystemDictionary::always_strong_classes_do(KlassClosure* closure) {
@@ -1679,17 +1685,6 @@
   return unloading_occurred;
 }
 
-void SystemDictionary::roots_oops_do(OopClosure* strong, OopClosure* weak) {
-  strong->do_oop(&_java_system_loader);
-  strong->do_oop(&_system_loader_lock_obj);
-
-  // Adjust dictionary
-  dictionary()->roots_oops_do(strong, weak);
-
-  // Visit extra methods
-  invoke_method_table()->oops_do(strong);
-}
-
 void SystemDictionary::oops_do(OopClosure* f) {
   f->do_oop(&_java_system_loader);
   f->do_oop(&_system_loader_lock_obj);