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

*** 192,216 ****
  
    // Because follow_root_closure is created statically, cannot
    // 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());
  
    // Need new claim bits before marking starts.
    ClassLoaderDataGraph::clear_claimed_marks();
  
    {
      StrongRootsScope srs(1);
  
!     gch->gen_process_roots(&srs,
!                            GenCollectedHeap::OldGen,
                             false, // Younger gens are not roots.
                             GenCollectedHeap::SO_None,
                             ClassUnloading,
                             &follow_root_closure,
-                            &follow_root_closure,
                             &follow_cld_closure);
    }
  
    // Process reference objects found during marking
    {
--- 192,214 ----
  
    // Because follow_root_closure is created statically, cannot
    // use OopsInGenClosure constructor which takes a generation,
    // as the Universe has not been created when the static constructors
    // are run.
!   follow_root_closure.set_generation(gch->old_gen());
  
    // Need new claim bits before marking starts.
    ClassLoaderDataGraph::clear_claimed_marks();
  
    {
      StrongRootsScope srs(1);
  
!     gch->old_process_roots(&srs,
                             false, // Younger gens are not roots.
                             GenCollectedHeap::SO_None,
                             ClassUnloading,
                             &follow_root_closure,
                             &follow_cld_closure);
    }
  
    // Process reference objects found during marking
    {
*** 282,302 ****
  
    // Because the closure below is created statically, we cannot
    // 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());
  
    {
      StrongRootsScope srs(1);
  
!     gch->gen_process_roots(&srs,
!                            GenCollectedHeap::OldGen,
                             false, // Younger gens are not roots.
                             GenCollectedHeap::SO_AllCodeCache,
!                            GenCollectedHeap::StrongAndWeakRoots,
!                            &adjust_pointer_closure,
                             &adjust_pointer_closure,
                             &adjust_cld_closure);
    }
  
    gch->gen_process_weak_roots(&adjust_pointer_closure);
--- 280,298 ----
  
    // Because the closure below is created statically, we cannot
    // use OopsInGenClosure constructor which takes a generation,
    // as the Universe has not been created when the static constructors
    // are run.
!   adjust_pointer_closure.set_generation(gch->old_gen());
  
    {
      StrongRootsScope srs(1);
  
!     gch->old_process_roots(&srs,
                             false, // Younger gens are not roots.
                             GenCollectedHeap::SO_AllCodeCache,
!                            false, // Strong and weak roots.
                             &adjust_pointer_closure,
                             &adjust_cld_closure);
    }
  
    gch->gen_process_weak_roots(&adjust_pointer_closure);