src/share/vm/gc/g1/g1CollectedHeap.cpp

rev 9080 : imported patch move-code
rev 9081 : imported patch rootclosureset
rev 9083 : imported patch erik-review
rev 9084 : [mq]: stefank-comments
rev 9085 : imported patch stefank-patch2
rev 9086 : imported patch trace-metadata
rev 9087 : imported patch parpush

*** 4434,4447 ****
  
        double start_strong_roots_sec = os::elapsedTime();
  
        _root_processor->evacuate_roots(pss->closures(), worker_id);
  
!       G1ParPushHeapRSClosure push_heap_rs_cl(_g1h, pss);
!       size_t cards_scanned = _g1h->g1_rem_set()->oops_into_collection_set_do(&push_heap_rs_cl,
!                                                                              pss->closures()->weak_codeblobs(),
!                                                                              worker_id);
  
        _pss->add_cards_scanned(worker_id, cards_scanned);
  
        double strong_roots_sec = os::elapsedTime() - start_strong_roots_sec;
  
--- 4434,4444 ----
  
        double start_strong_roots_sec = os::elapsedTime();
  
        _root_processor->evacuate_roots(pss->closures(), worker_id);
  
!       size_t cards_scanned = _g1h->g1_rem_set()->oops_into_collection_set_do(pss->closures(), worker_id);
  
        _pss->add_cards_scanned(worker_id, cards_scanned);
  
        double strong_roots_sec = os::elapsedTime() - start_strong_roots_sec;