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

@@ -37,11 +37,11 @@
 inline HeapWord* ShenandoahForwarding::get_forwardee_raw_unchecked(oop obj) {
   markWord mark = obj->mark_raw();
   if (mark.is_marked()) {
     return (HeapWord*) mark.clear_lock_bits().to_pointer();
   } else {
-    return (HeapWord*) obj;
+    return cast_from_oop<HeapWord*>(obj);
   }
 }
 
 inline oop ShenandoahForwarding::get_forwardee(oop obj) {
   shenandoah_assert_correct(NULL, obj);