src/share/vm/gc_implementation/g1/concurrentMark.cpp

*** 1993,2011 ****
  
    double start = os::elapsedTime();
  
    HeapRegionRemSet::reset_for_cleanup_tasks();
  
-   uint n_workers;
- 
    // Do counting once more with the world stopped for good measure.
    G1ParFinalCountTask g1_par_count_task(g1h, &_region_bm, &_card_bm);
  
    g1h->set_par_threads();
!   n_workers = g1h->n_par_threads();
!   assert(g1h->n_par_threads() == n_workers,
!          "Should not have been reset");
    g1h->workers()->run_task(&g1_par_count_task);
    // Done with the parallel phase so reset to 0.
    g1h->set_par_threads(0);
  
    if (VerifyDuringGC) {
--- 1993,2007 ----
  
    double start = os::elapsedTime();
  
    HeapRegionRemSet::reset_for_cleanup_tasks();
  
    // Do counting once more with the world stopped for good measure.
    G1ParFinalCountTask g1_par_count_task(g1h, &_region_bm, &_card_bm);
  
    g1h->set_par_threads();
!   uint n_workers = _g1h->workers()->active_workers();
    g1h->workers()->run_task(&g1_par_count_task);
    // Done with the parallel phase so reset to 0.
    g1h->set_par_threads(0);
  
    if (VerifyDuringGC) {