--- old/src/share/vm/gc/serial/defNewGeneration.cpp	2015-10-21 17:28:34.000000000 +0200
+++ new/src/share/vm/gc/serial/defNewGeneration.cpp	2015-10-21 17:28:34.000000000 +0200
@@ -626,15 +626,10 @@
     // See: CardTableModRefBSForCTRS::non_clean_card_iterate_possibly_parallel.
     StrongRootsScope srs(0);
 
-    gch->gen_process_roots(&srs,
-                           GenCollectedHeap::YoungGen,
-                           true,  // Process younger gens, if any,
-                                  // as strong roots.
-                           GenCollectedHeap::SO_ScavengeCodeCache,
-                           GenCollectedHeap::StrongAndWeakRoots,
-                           &fsc_with_no_gc_barrier,
-                           &fsc_with_gc_barrier,
-                           &cld_scan_closure);
+    gch->young_process_roots(&srs,
+                             &fsc_with_no_gc_barrier,
+                             &fsc_with_gc_barrier,
+                             &cld_scan_closure);
   }
 
   // "evacuate followers".
@@ -850,11 +845,10 @@
                                                                 \
 void DefNewGeneration::                                         \
 oop_since_save_marks_iterate##nv_suffix(OopClosureType* cl) {   \
-  cl->set_generation(this);                                     \
+  cl->assert_generation(this);                                  \
   eden()->oop_since_save_marks_iterate##nv_suffix(cl);          \
   to()->oop_since_save_marks_iterate##nv_suffix(cl);            \
   from()->oop_since_save_marks_iterate##nv_suffix(cl);          \
-  cl->reset_generation();                                       \
   save_marks();                                                 \
 }