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

rev 12937 : imported patch 8071280-specialize-heapregion-oops-on-card-seq-iterate
rev 12938 : imported patch 8071280-kim-review

@@ -686,13 +686,13 @@
                                                  worker_i);
   update_rs_oop_cl.set_from(r);
 
   bool card_processed;
   if (_g1->is_gc_active()) {
-    card_processed = r->oops_on_card_seq_iterate_careful<G1UpdateRSOrPushRefOopClosure, true>(dirty_region,                                                                                         &update_rs_oop_cl);
+    card_processed = r->oops_on_card_seq_iterate_careful<true>(dirty_region, &update_rs_oop_cl);
   } else {
-    card_processed = r->oops_on_card_seq_iterate_careful<G1UpdateRSOrPushRefOopClosure, false>(dirty_region,                                                                                      &update_rs_oop_cl);      
+    card_processed = r->oops_on_card_seq_iterate_careful<false>(dirty_region, &update_rs_oop_cl);      
   }
 
   // If unable to process the card then we encountered an unparsable
   // part of the heap (e.g. a partially allocated object) while
   // processing a stale card.  Despite the card being stale, redirty

@@ -723,11 +723,11 @@
   // a GC worker thread.
   assert(!has_refs_into_cset || SafepointSynchronize::is_at_safepoint(),
          "invalid result at non safepoint");
 
   return has_refs_into_cset;
-  }
+}
 
 void G1RemSet::print_periodic_summary_info(const char* header, uint period_count) {
   if ((G1SummarizeRSetStatsPeriod > 0) && log_is_enabled(Trace, gc, remset) &&
       (period_count % G1SummarizeRSetStatsPeriod == 0)) {