--- old/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp 2018-07-06 17:47:32.812495994 +0200 +++ new/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp 2018-07-06 17:47:32.344501959 +0200 @@ -342,12 +342,6 @@ } } -#ifdef ASSERT -void ShenandoahBarrierSet::verify_safe_oop(oop p) { - shenandoah_assert_not_in_cset_except(NULL, p, (p == NULL) || ShenandoahHeap::heap()->cancelled_gc()); -} -#endif - void ShenandoahBarrierSet::on_thread_create(Thread* thread) { // Create thread local data ShenandoahThreadLocalData::create(thread);