--- old/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp	2020-01-24 15:19:23.274777947 +0100
+++ new/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp	2020-01-24 15:19:23.042774050 +0100
@@ -168,7 +168,7 @@
       ShenandoahHeapRegion* r = _heap->heap_region_containing(obj);
       assert(r->is_cset(), "sanity");
 
-      HeapWord* cur = (HeapWord*)obj + obj->size();
+      HeapWord* cur = cast_from_oop<HeapWord*>(obj) + obj->size();
 
       size_t count = 0;
       while ((cur < r->top()) && ctx->is_marked(oop(cur)) && (count++ < max)) {