--- old/src/share/vm/gc/serial/tenuredGeneration.cpp	2015-10-16 17:28:10.000000000 +0200
+++ new/src/share/vm/gc/serial/tenuredGeneration.cpp	2015-10-16 17:28:10.000000000 +0200
@@ -270,9 +270,8 @@
                                                                                 \
 void TenuredGeneration::                                                        \
 oop_since_save_marks_iterate##nv_suffix(OopClosureType* blk) {                  \
-  blk->set_generation(this);                                                    \
+  blk->assert_generation(this);                                                 \
   _the_space->oop_since_save_marks_iterate##nv_suffix(blk);                     \
-  blk->reset_generation();                                                      \
   save_marks();                                                                 \
 }