--- old/src/share/vm/gc/serial/markSweep.inline.hpp	2015-06-22 11:04:43.650678581 +0200
+++ new/src/share/vm/gc/serial/markSweep.inline.hpp	2015-06-22 11:04:43.486677768 +0200
@@ -72,10 +72,14 @@
   MarkSweep::mark_and_push(&op);
 }
 
+inline void MarkSweep::follow_cld(ClassLoaderData* cld) {
+  MarkSweep::follow_cld_closure.do_cld(cld);
+}
+
 inline void MarkSweep::follow_object(oop obj) {
   assert(obj->is_gc_marked(), "should be marked");
 
-  obj->ms_follow_contents();
+  obj->oop_iterate(&mark_and_push_closure);
 }
 
 template <class T> inline void MarkSweep::follow_root(T* p) {