src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp

@@ -166,11 +166,11 @@
                                       _heap->marking_context() : _heap->complete_marking_context();
 
       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)) {
         oop cur_oop = oop(cur);
         if (cur_oop == resolve_forwarded_not_null(cur_oop)) {