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

rev 12551 : Refactor/consolidate/cleanup

@@ -57,20 +57,20 @@
 
   assert(oopDesc::unsafe_equals(obj, ShenandoahBarrierSet::resolve_oop_static_not_null(obj)), "expect forwarded obj in queue");
 
 #ifdef ASSERT
   if (! oopDesc::bs()->is_safe(obj)) {
-    tty->print_cr("trying to mark obj: "PTR_FORMAT" (%s) in dirty region: ", p2i((HeapWord*) obj), BOOL_TO_STR(_heap->is_marked_current(obj)));
+    tty->print_cr("trying to mark obj: "PTR_FORMAT" (%s) in dirty region: ", p2i((HeapWord*) obj), BOOL_TO_STR(_heap->is_marked_next(obj)));
     //      _heap->heap_region_containing(obj)->print();
     //      _heap->print_heap_regions();
   }
 #endif
   assert(_heap->cancelled_concgc()
          || oopDesc::bs()->is_safe(obj),
          "we don't want to mark objects in from-space");
   assert(_heap->is_in(obj), "referenced objects must be in the heap. No?");
-  assert(_heap->is_marked_current(obj), "only marked objects on task queue");
+  assert(_heap->is_marked_next(obj), "only marked objects on task queue");
 
   if (from == -1) {
     count_liveness(obj);
     if (obj->is_objArray()) {
       // Case 1: Array instance and no task bounds set. Must be the first time

@@ -178,22 +178,22 @@
 }
 
 inline void ShenandoahConcurrentMark::mark_and_push(oop obj, ShenandoahHeap* heap, SCMObjToScanQueue* q) {
 #ifdef ASSERT
   if (! oopDesc::bs()->is_safe(obj)) {
-    tty->print_cr("obj in cset: %s, obj: %p, forw: %p", BOOL_TO_STR(heap->in_cset_fast_test((HeapWord*) obj)), (HeapWord*) obj, (HeapWord*) ShenandoahBarrierSet::resolve_oop_static_not_null(obj));
+    tty->print_cr("obj in cset: %s, obj: %p, forw: %p", BOOL_TO_STR(heap->in_collection_set(obj)), (HeapWord*) obj, (HeapWord*) ShenandoahBarrierSet::resolve_oop_static_not_null(obj));
     heap->heap_region_containing((HeapWord*) obj)->print();
   }
 #endif
   assert(oopDesc::bs()->is_safe(obj), "no ref in cset");
   assert(Universe::heap()->is_in(obj), "We shouldn't be calling this on objects not in the heap: "PTR_FORMAT, p2i(obj));
-  if (heap->mark_current(obj)) {
+  if (heap->mark_next(obj)) {
 #ifdef ASSERT
     log_develop_trace(gc, marking)("marked obj: "PTR_FORMAT, p2i((HeapWord*) obj));
 
     if (! oopDesc::bs()->is_safe(obj)) {
-       tty->print_cr("trying to mark obj: "PTR_FORMAT" (%s) in dirty region: ", p2i((HeapWord*) obj), BOOL_TO_STR(heap->is_marked_current(obj)));
+       tty->print_cr("trying to mark obj: "PTR_FORMAT" (%s) in dirty region: ", p2i((HeapWord*) obj), BOOL_TO_STR(heap->is_marked_next(obj)));
       //      _heap->heap_region_containing(obj)->print();
       //      _heap->print_heap_regions();
     }
 #endif
     assert(heap->cancelled_concgc()

@@ -205,11 +205,11 @@
 
   }
 #ifdef ASSERT
   else {
     log_develop_trace(gc, marking)("failed to mark obj (already marked): "PTR_FORMAT, p2i((HeapWord*) obj));
-    assert(heap->is_marked_current(obj), "make sure object is marked");
+    assert(heap->is_marked_next(obj), "make sure object is marked");
   }
 #endif
 }
 
 #endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP