--- old/src/share/vm/gc/serial/genMarkSweep.cpp	2015-10-16 17:28:10.000000000 +0200
+++ new/src/share/vm/gc/serial/genMarkSweep.cpp	2015-10-16 17:28:10.000000000 +0200
@@ -194,7 +194,7 @@
   // use OopsInGenClosure constructor which takes a generation,
   // as the Universe has not been created when the static constructors
   // are run.
-  follow_root_closure.set_orig_generation(gch->old_gen());
+  follow_root_closure.set_generation(gch->old_gen());
 
   // Need new claim bits before marking starts.
   ClassLoaderDataGraph::clear_claimed_marks();
@@ -202,13 +202,11 @@
   {
     StrongRootsScope srs(1);
 
-    gch->gen_process_roots(&srs,
-                           GenCollectedHeap::OldGen,
+    gch->old_process_roots(&srs,
                            false, // Younger gens are not roots.
                            GenCollectedHeap::SO_None,
                            ClassUnloading,
                            &follow_root_closure,
-                           &follow_root_closure,
                            &follow_cld_closure);
   }
 
@@ -284,17 +282,15 @@
   // use OopsInGenClosure constructor which takes a generation,
   // as the Universe has not been created when the static constructors
   // are run.
-  adjust_pointer_closure.set_orig_generation(gch->old_gen());
+  adjust_pointer_closure.set_generation(gch->old_gen());
 
   {
     StrongRootsScope srs(1);
 
-    gch->gen_process_roots(&srs,
-                           GenCollectedHeap::OldGen,
+    gch->old_process_roots(&srs,
                            false, // Younger gens are not roots.
                            GenCollectedHeap::SO_AllCodeCache,
-                           GenCollectedHeap::StrongAndWeakRoots,
-                           &adjust_pointer_closure,
+                           false, // Strong and weak roots.
                            &adjust_pointer_closure,
                            &adjust_cld_closure);
   }