--- old/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp	2020-01-24 15:21:04.988487101 +0100
+++ new/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp	2020-01-24 15:21:04.652481453 +0100
@@ -42,7 +42,7 @@
 }
 
 inline oop ShenandoahBarrierSet::resolve_forwarded(oop p) {
-  if (p != NULL) {
+  if (cast_from_oop<HeapWord*>(p) != NULL) {
     return resolve_forwarded_not_null(p);
   } else {
     return p;