src/share/vm/gc/serial/defNewGeneration.cpp

*** 624,642 ****
      // DefNew needs to run with n_threads == 0, to make sure the serial
      // version of the card table scanning code is used.
      // 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);
    }
  
    // "evacuate followers".
    evacuate_followers.do_void();
  
--- 624,637 ----
      // DefNew needs to run with n_threads == 0, to make sure the serial
      // version of the card table scanning code is used.
      // See: CardTableModRefBSForCTRS::non_clean_card_iterate_possibly_parallel.
      StrongRootsScope srs(0);
  
!     gch->young_process_roots(&srs,
!                              &fsc_with_no_gc_barrier,
!                              &fsc_with_gc_barrier,
!                              &cld_scan_closure);
    }
  
    // "evacuate followers".
    evacuate_followers.do_void();
  
*** 848,862 ****
  
  #define DefNew_SINCE_SAVE_MARKS_DEFN(OopClosureType, nv_suffix) \
                                                                  \
  void DefNewGeneration::                                         \
  oop_since_save_marks_iterate##nv_suffix(OopClosureType* cl) {   \
!   cl->set_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();                                                 \
  }
  
  ALL_SINCE_SAVE_MARKS_CLOSURES(DefNew_SINCE_SAVE_MARKS_DEFN)
  
--- 843,856 ----
  
  #define DefNew_SINCE_SAVE_MARKS_DEFN(OopClosureType, nv_suffix) \
                                                                  \
  void DefNewGeneration::                                         \
  oop_since_save_marks_iterate##nv_suffix(OopClosureType* cl) {   \
!   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);          \
    save_marks();                                                 \
  }
  
  ALL_SINCE_SAVE_MARKS_CLOSURES(DefNew_SINCE_SAVE_MARKS_DEFN)