diff -r 39063b484ec2 -r 9119841280f4 hotspot/src/share/vm/runtime/safepoint.cpp
--- a/hotspot/src/share/vm/runtime/safepoint.cpp	Wed Aug 23 10:25:25 2017 +0200
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp	Wed Aug 23 14:52:55 2017 -0400
@@ -1104,7 +1104,7 @@
       // the other registers. In order to preserve it over GCs we need
       // to keep it in a handle.
       oop result = caller_fr.saved_oop_result(&map);
-      assert(result == NULL || result->is_oop(), "must be oop");
+      assert(oopDesc::is_oop_or_null(result), "must be oop");
       return_value = Handle(thread(), result);
       assert(Universe::heap()->is_in_or_null(result), "must be heap pointer");
     }