diff -r 0cef600ba9b7 -r 693058672cc6 hotspot/src/share/vm/gc/cms/parOopClosures.inline.hpp
--- a/hotspot/src/share/vm/gc/cms/parOopClosures.inline.hpp	Wed Jun 17 15:45:43 2015 +0000
+++ b/hotspot/src/share/vm/gc/cms/parOopClosures.inline.hpp	Wed Jun 17 14:44:54 2015 +0200
@@ -72,7 +72,7 @@
                                         bool root_scan) {
   assert((!GenCollectedHeap::heap()->is_in_reserved(p) ||
           generation()->is_in_reserved(p))
-         && (generation()->level() == 0 || gc_barrier),
+         && (GenCollectedHeap::heap()->is_young_gen(generation()) || gc_barrier),
          "The gen must be right, and we must be doing the barrier "
          "in older generations.");
   T heap_oop = oopDesc::load_heap_oop(p);