src/share/vm/gc/shenandoah/shenandoahHeapRegion.cpp

rev 14451 : imported patch bitmap_uncommit.patch
rev 14452 : imported patch onebitmap.patch

@@ -385,13 +385,12 @@
   } else {
     st->print("| ");
   }
   st->print("|CP " SIZE_FORMAT_W(3), _critical_pins);
 
-  st->print_cr("|TAMS " PTR_FORMAT ", " PTR_FORMAT "|",
-               p2i(ShenandoahHeap::heap()->complete_top_at_mark_start(_bottom)),
-               p2i(ShenandoahHeap::heap()->next_top_at_mark_start(_bottom)));
+  st->print_cr("|TAMS " PTR_FORMAT "|",
+               p2i(ShenandoahHeap::heap()->top_at_mark_start(_bottom)));
 }
 
 void ShenandoahHeapRegion::object_iterate_interruptible(ObjectClosure* blk, bool allow_cancel) {
   HeapWord* p = bottom() + BrooksPointer::word_size();
   while (p < top() && !(allow_cancel && _heap->cancelled_concgc())) {

@@ -480,13 +479,13 @@
   _first_alloc_seq_num = 0;
   _last_alloc_seq_num = 0;
 
   // Reset C-TAMS pointer to ensure size-based iteration, everything
   // in that regions is going to be new objects.
-  _heap->set_complete_top_at_mark_start(bottom(), bottom());
+  _heap->set_top_at_mark_start(bottom(), bottom());
   // We can only safely reset the C-TAMS pointer if the bitmap is clear for that region.
-  assert(_heap->is_complete_bitmap_clear_range(bottom(), end()), "must be clear");
+  assert(_heap->is_bitmap_clear_range(bottom(), end()), "must be clear");
 
   make_empty_committed();
 }
 
 void ShenandoahHeapRegion::recycle() {