src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp

rev 11983 : 8166276: Refactor gen_process_roots to allow simpler fix for 8165949
Reviewed-by:
Contributed-by: jesper.wilhelmsson@oracle.com

*** 2338,2354 ****
    gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
    {
      StrongRootsScope srs(1);
  
!     gch->gen_process_roots(&srs,
!                            GenCollectedHeap::OldGen,
                             true,   // young gen as roots
                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
                             should_unload_classes(),
                             &notOlder,
-                            NULL,
                             NULL);
    }
  
    // Now mark from the roots
    MarkFromRootsClosure markFromRootsClosure(this, _span,
--- 2338,2352 ----
    gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
    {
      StrongRootsScope srs(1);
  
!     gch->old_process_roots(&srs,
                             true,   // young gen as roots
                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
                             should_unload_classes(),
                             &notOlder,
                             NULL);
    }
  
    // Now mark from the roots
    MarkFromRootsClosure markFromRootsClosure(this, _span,
*** 2412,2428 ****
    gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
    {
      StrongRootsScope srs(1);
  
!     gch->gen_process_roots(&srs,
!                            GenCollectedHeap::OldGen,
                             true,   // young gen as roots
                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
                             should_unload_classes(),
                             &notOlder,
-                            NULL,
                             &cld_closure);
    }
  
    // Now mark from the roots
    MarkFromRootsVerifyClosure markFromRootsClosure(this, _span,
--- 2410,2424 ----
    gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
    {
      StrongRootsScope srs(1);
  
!     gch->old_process_roots(&srs,
                             true,   // young gen as roots
                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
                             should_unload_classes(),
                             &notOlder,
                             &cld_closure);
    }
  
    // Now mark from the roots
    MarkFromRootsVerifyClosure markFromRootsClosure(this, _span,
*** 2901,2917 ****
        CLDToOopClosure cld_closure(&notOlder, true);
        gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
        StrongRootsScope srs(1);
  
!       gch->gen_process_roots(&srs,
!                              GenCollectedHeap::OldGen,
                               true,   // young gen as roots
                               GenCollectedHeap::ScanningOption(roots_scanning_options()),
                               should_unload_classes(),
                               &notOlder,
-                              NULL,
                               &cld_closure);
      }
    }
  
    // Clear mod-union table; it will be dirtied in the prologue of
--- 2897,2911 ----
        CLDToOopClosure cld_closure(&notOlder, true);
        gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
  
        StrongRootsScope srs(1);
  
!       gch->old_process_roots(&srs,
                               true,   // young gen as roots
                               GenCollectedHeap::ScanningOption(roots_scanning_options()),
                               should_unload_classes(),
                               &notOlder,
                               &cld_closure);
      }
    }
  
    // Clear mod-union table; it will be dirtied in the prologue of
*** 4288,4304 ****
    _timer.reset();
    _timer.start();
  
    CLDToOopClosure cld_closure(&par_mri_cl, true);
  
!   gch->gen_process_roots(_strong_roots_scope,
!                          GenCollectedHeap::OldGen,
                           false,     // yg was scanned above
                           GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
                           _collector->should_unload_classes(),
                           &par_mri_cl,
-                          NULL,
                           &cld_closure);
    assert(_collector->should_unload_classes()
           || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
    _timer.stop();
--- 4282,4296 ----
    _timer.reset();
    _timer.start();
  
    CLDToOopClosure cld_closure(&par_mri_cl, true);
  
!   gch->old_process_roots(_strong_roots_scope,
                           false,     // yg was scanned above
                           GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
                           _collector->should_unload_classes(),
                           &par_mri_cl,
                           &cld_closure);
    assert(_collector->should_unload_classes()
           || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
    _timer.stop();
*** 4419,4435 ****
    }
  
    // ---------- remaining roots --------------
    _timer.reset();
    _timer.start();
!   gch->gen_process_roots(_strong_roots_scope,
!                          GenCollectedHeap::OldGen,
                           false,     // yg was scanned above
                           GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
                           _collector->should_unload_classes(),
                           &par_mrias_cl,
-                          NULL,
                           NULL);     // The dirty klasses will be handled below
  
    assert(_collector->should_unload_classes()
           || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
--- 4411,4425 ----
    }
  
    // ---------- remaining roots --------------
    _timer.reset();
    _timer.start();
!   gch->old_process_roots(_strong_roots_scope,
                           false,     // yg was scanned above
                           GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
                           _collector->should_unload_classes(),
                           &par_mrias_cl,
                           NULL);     // The dirty klasses will be handled below
  
    assert(_collector->should_unload_classes()
           || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
           "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
*** 4968,4984 ****
      verify_work_stacks_empty();
  
      gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
      StrongRootsScope srs(1);
  
!     gch->gen_process_roots(&srs,
!                            GenCollectedHeap::OldGen,
                             true,  // young gen as roots
                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
                             should_unload_classes(),
                             &mrias_cl,
-                            NULL,
                             NULL); // The dirty klasses will be handled below
  
      assert(should_unload_classes()
             || (roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
             "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
--- 4958,4972 ----
      verify_work_stacks_empty();
  
      gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
      StrongRootsScope srs(1);
  
!     gch->old_process_roots(&srs,
                             true,  // young gen as roots
                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
                             should_unload_classes(),
                             &mrias_cl,
                             NULL); // The dirty klasses will be handled below
  
      assert(should_unload_classes()
             || (roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
             "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");