src/share/vm/gc/shenandoah/brooksPointer.inline.hpp

rev 12551 : Refactor/consolidate/cleanup

@@ -57,12 +57,12 @@
   assert (holder->klass() == update->klass(), "klasses should match");
 
   assert(!oopDesc::unsafe_equals(holder, update), "forwarding should make progress");
   assert(ShenandoahHeap::heap()->heap_region_containing(holder) !=
          ShenandoahHeap::heap()->heap_region_containing(update), "forwarding should be across regions");
-  assert( ShenandoahHeap::heap()->in_cset_fast_test((HeapWord*) holder), "holder should be in collection set");
-  assert(!ShenandoahHeap::heap()->in_cset_fast_test((HeapWord*) update), "update should not be in collection set");
+  assert( ShenandoahHeap::heap()->in_collection_set(holder), "holder should be in collection set");
+  assert(!ShenandoahHeap::heap()->in_collection_set(update), "update should not be in collection set");
 #endif
 
   *brooks_ptr_addr(holder) = (HeapWord*) update;
 }
 

@@ -126,12 +126,12 @@
   assert(!oopDesc::unsafe_equals(holder, update), "forwarding should make progress");
   assert(ShenandoahHeap::heap()->is_in(holder), "holder must point to a heap address");
   assert(ShenandoahHeap::heap()->is_in(update), "update must point to a heap address");
   assert(ShenandoahHeap::heap()->heap_region_containing(holder) !=
          ShenandoahHeap::heap()->heap_region_containing(update), "forwarding should be across regions");
-  assert( ShenandoahHeap::heap()->in_cset_fast_test((HeapWord*) holder), "holder should be in collection set");
-  assert(!ShenandoahHeap::heap()->in_cset_fast_test((HeapWord*) update), "update should not be in collection set");
+  assert( ShenandoahHeap::heap()->in_collection_set(holder), "holder should be in collection set");
+  assert(!ShenandoahHeap::heap()->in_collection_set(update), "update should not be in collection set");
   assert (holder->klass() == update->klass(), "klasses should match");
 
   oop result;
   if (ShenandoahVerifyWritesToFromSpace || ShenandoahVerifyReadsToFromSpace) {
     ShenandoahHeap* sh = (ShenandoahHeap*) Universe::heap();