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

@@ -3600,11 +3600,10 @@
     G1CollectedHeap* _g1h;
     G1PrepareEvacuationTask* _parent_task;
     size_t _worker_humongous_total;
     size_t _worker_humongous_candidates;
 
-
     bool humongous_region_is_candidate(HeapRegion* region) const {
       assert(region->is_starts_humongous(), "Must start a humongous object");
 
       oop obj = oop(region->bottom());
 

@@ -3671,11 +3670,11 @@
       _parent_task->add_humongous_total(_worker_humongous_total);
     }
 
     virtual bool do_heap_region(HeapRegion* hr) {
       // First prepare the region for scanning
-      _g1h->rem_set()->prepare_region_for_scanning(hr);
+      _g1h->rem_set()->prepare_region_for_scan(hr);
 
       // Now check if region is a humongous candidate
       if (!hr->is_starts_humongous()) {
         _g1h->register_region_with_region_attr(hr);
         return false;

@@ -3693,11 +3692,10 @@
       }
       _worker_humongous_total++;
 
       return false;
     }
-
   };
 
   G1CollectedHeap* _g1h;
   HeapRegionClaimer _claimer;
   volatile size_t _humongous_total;

@@ -3706,13 +3704,11 @@
   G1PrepareEvacuationTask(G1CollectedHeap* g1h) :
     AbstractGangTask("Prepare Evacuation"),
     _g1h(g1h),
     _claimer(_g1h->workers()->active_workers()),
     _humongous_total(0),
-    _humongous_candidates(0) {
-
-  }
+    _humongous_candidates(0) { }
 
   ~G1PrepareEvacuationTask() {
     _g1h->set_has_humongous_reclaim_candidate(_humongous_candidates > 0);
   }