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

rev 13131 : imported patch 8178148-more-detailed-scan-rs-logging
rev 13135 : imported patch 8175554-improve-g1updatersorpushrefclosure
rev 13138 : [mq]: 8175554-erikd-review3

*** 3456,3472 ****
  
        double start_strong_roots_sec = os::elapsedTime();
  
        _root_processor->evacuate_roots(pss->closures(), worker_id);
  
-       G1ParPushHeapRSClosure push_heap_rs_cl(_g1h, pss);
- 
        // We pass a weak code blobs closure to the remembered set scanning because we want to avoid
        // treating the nmethods visited to act as roots for concurrent marking.
        // We only want to make sure that the oops in the nmethods are adjusted with regard to the
        // objects copied by the current evacuation.
!       _g1h->g1_rem_set()->oops_into_collection_set_do(&push_heap_rs_cl,
                                                        pss->closures()->weak_codeblobs(),
                                                        worker_id);
  
        double strong_roots_sec = os::elapsedTime() - start_strong_roots_sec;
  
--- 3456,3470 ----
  
        double start_strong_roots_sec = os::elapsedTime();
  
        _root_processor->evacuate_roots(pss->closures(), worker_id);
  
        // We pass a weak code blobs closure to the remembered set scanning because we want to avoid
        // treating the nmethods visited to act as roots for concurrent marking.
        // We only want to make sure that the oops in the nmethods are adjusted with regard to the
        // objects copied by the current evacuation.
!       _g1h->g1_rem_set()->oops_into_collection_set_do(pss,
                                                        pss->closures()->weak_codeblobs(),
                                                        worker_id);
  
        double strong_roots_sec = os::elapsedTime() - start_strong_roots_sec;