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

rev 49075 : Make Traversal share code with conc-mark

@@ -36,11 +36,11 @@
 
 template <class T, bool COUNT_LIVENESS>
 void ShenandoahConcurrentMark::do_task(ShenandoahObjToScanQueue* q, T* cl, jushort* live_data, ShenandoahMarkTask* task) {
   oop obj = task->obj();
 
-  shenandoah_assert_not_forwarded(NULL, obj);
+  shenandoah_assert_not_forwarded_except(NULL, obj, _heap->is_concurrent_traversal_in_progress() && _heap->cancelled_concgc());
   shenandoah_assert_marked_next(NULL, obj);
   shenandoah_assert_not_in_cset_except(NULL, obj, _heap->cancelled_concgc());
 
   if (task->is_not_chunked()) {
     if (COUNT_LIVENESS) count_liveness(live_data, obj);