--- old/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp	2020-01-24 15:17:53.809275504 +0100
+++ new/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp	2020-01-24 15:17:53.565271408 +0100
@@ -42,7 +42,7 @@
 }
 
 inline oop ShenandoahBarrierSet::resolve_forwarded(oop p) {
-  if (p != NULL) {
+  if (((HeapWord*) p) != NULL) {
     return resolve_forwarded_not_null(p);
   } else {
     return p;
@@ -268,7 +268,7 @@
     T o = RawAccess<>::oop_load(elem_ptr);
     if (!CompressedOops::is_null(o)) {
       oop obj = CompressedOops::decode_not_null(o);
-      if (HAS_FWD && cset->is_in(cast_from_oop<HeapWord *>(obj))) {
+      if (HAS_FWD && cset->is_in((HeapWord *) obj)) {
         assert(_heap->has_forwarded_objects(), "only get here with forwarded objects");
         oop fwd = resolve_forwarded_not_null(obj);
         if (EVAC && obj == fwd) {