--- old/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp	2019-08-13 12:39:46.420162990 +0200
+++ new/src/hotspot/share/gc/shenandoah/shenandoahForwarding.inline.hpp	2019-08-13 12:39:46.116157716 +0200
@@ -36,8 +36,8 @@
 
 inline HeapWord* ShenandoahForwarding::get_forwardee_raw_unchecked(oop obj) {
   markWord mark = obj->mark_raw();
-  if (mark->is_marked()) {
-    return (HeapWord*) mark->clear_lock_bits();
+  if (mark.is_marked()) {
+    return (HeapWord*) mark.clear_lock_bits().to_pointer();
   } else {
     return (HeapWord*) obj;
   }
@@ -49,13 +49,13 @@
 }
 
 inline bool ShenandoahForwarding::is_forwarded(oop obj) {
-  return obj->mark_raw()->is_marked();
+  return obj->mark_raw().is_marked();
 }
 
 inline oop ShenandoahForwarding::try_update_forwardee(oop obj, oop update) {
   markWord old_mark = obj->mark_raw();
-  if (old_mark->is_marked()) {
-    return oop(reinterpret_cast<oopDesc*>(old_mark->clear_lock_bits()));
+  if (old_mark.is_marked()) {
+    return oop(old_mark.clear_lock_bits().to_pointer());
   }
 
   markWord new_mark = markWord::encode_pointer_as_mark(update);
@@ -63,7 +63,7 @@
   if (prev_mark == old_mark) {
     return update;
   } else {
-    return oop(reinterpret_cast<oopDesc*>(prev_mark->clear_lock_bits()));
+    return oop(prev_mark.clear_lock_bits().to_pointer());
   }
 }