--- old/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp	2019-08-09 00:53:20.201863353 +0200
+++ new/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp	2019-08-09 00:53:19.559852237 +0200
@@ -55,7 +55,7 @@
 inline oop ShenandoahForwarding::try_update_forwardee(oop obj, oop update) {
   markWord old_mark = obj->mark_raw();
   if (MarkWord::is_marked(old_mark)) {
-    return (oop) MarkWord::clear_lock_bits(old_mark);
+    return oop(reinterpret_cast<oopDesc*>(MarkWord::clear_lock_bits(old_mark)));
   }
 
   markWord new_mark = MarkWord::encode_pointer_as_mark(update);
@@ -63,7 +63,7 @@
   if (prev_mark == old_mark) {
     return update;
   } else {
-    return (oop) MarkWord::clear_lock_bits(prev_mark);
+    return oop(reinterpret_cast<oopDesc*>(MarkWord::clear_lock_bits(prev_mark)));
   }
 }