--- old/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp	2020-01-24 15:17:55.869310089 +0100
+++ new/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp	2020-01-24 15:17:55.605305657 +0100
@@ -39,7 +39,7 @@
   if (mark.is_marked()) {
     return (HeapWord*) mark.clear_lock_bits().to_pointer();
   } else {
-    return cast_from_oop<HeapWord*>(obj);
+    return (HeapWord*) obj;
   }
 }