src/share/vm/gc/shared/collectorPolicy.cpp

rev 12854 : [mq]: gcinterface.patch

@@ -149,12 +149,12 @@
   bool result = _should_clear_all_soft_refs;
   set_should_clear_all_soft_refs(false);
   return result;
 }
 
-CardTableRS* CollectorPolicy::create_rem_set(MemRegion whole_heap) {
-  return new CardTableRS(whole_heap);
+CardTableRS* CollectorPolicy::create_rem_set(MemRegion whole_heap, CardTableModRefBSForCTRS* ct_bs) {
+  return new CardTableRS(whole_heap, ct_bs);
 }
 
 void CollectorPolicy::cleared_all_soft_refs() {
   // If near gc overhear limit, continue to clear SoftRefs.  SoftRefs may
   // have been cleared in the last collection but if the gc overhear

@@ -411,12 +411,10 @@
         _initial_young_size = NewSize;
       }
     }
   }
 
-  always_do_update_barrier = UseConcMarkSweepGC;
-
   DEBUG_ONLY(GenCollectorPolicy::assert_flags();)
 }
 
 // Values set on the command line win over any ergonomically
 // set command line parameters.

@@ -841,12 +839,12 @@
       }
     }
 
     {  // Need lock to get self consistent gc_count's
       MutexLocker ml(Heap_lock);
-      gc_count      = Universe::heap()->total_collections();
-      full_gc_count = Universe::heap()->total_full_collections();
+      gc_count      = GC::gc()->heap()->total_collections();
+      full_gc_count = GC::gc()->heap()->total_full_collections();
     }
 
     // Generate a VM operation
     VM_CollectForMetadataAllocation op(loader_data,
                                        word_size,