src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp

@@ -40,11 +40,11 @@
 inline oop ShenandoahBarrierSet::resolve_forwarded_not_null(oop p) {
   return ShenandoahForwarding::get_forwardee(p);
 }
 
 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;
   }
 }