--- old/src/share/vm/gc/shenandoah/shenandoahBarrierSet.cpp	2017-10-09 11:48:31.681327661 +0200
+++ new/src/share/vm/gc/shenandoah/shenandoahBarrierSet.cpp	2017-10-09 11:48:31.577327405 +0200
@@ -411,15 +411,13 @@
   if (p == NULL) return;
   if (heap->in_collection_set(p) &&
       ! heap->cancelled_concgc()) {
-    tty->print_cr("oop = "PTR_FORMAT", resolved: "PTR_FORMAT", marked-next %s, marked-complete: %s",
+    tty->print_cr("oop = "PTR_FORMAT", resolved: "PTR_FORMAT", marked %s",
                   p2i(p),
                   p2i(read_barrier(p)),
-                  BOOL_TO_STR(heap->is_marked_next(p)),
-                  BOOL_TO_STR(heap->is_marked_complete(p)));
+                  BOOL_TO_STR(heap->is_marked(p)));
     tty->print_cr("in_cset: %s", BOOL_TO_STR(heap->in_collection_set(p)));
     heap->heap_region_containing((HeapWord*) p)->print();
-    tty->print_cr("top-at-mark-start: %p", heap->next_top_at_mark_start((HeapWord*) p));
-    tty->print_cr("top-at-prev-mark-start: %p", heap->complete_top_at_mark_start((HeapWord*) p));
+    tty->print_cr("top-at-mark-start: %p", heap->top_at_mark_start((HeapWord*) p));
     tty->print_cr("marking: %s, evacuating: %s", BOOL_TO_STR(heap->concurrent_mark_in_progress()), BOOL_TO_STR(heap->is_evacuation_in_progress()));
     assert(false, "We should have fixed this earlier");
   }