--- old/src/share/vm/runtime/safepoint.cpp	2017-08-17 11:34:49.886628263 -0400
+++ new/src/share/vm/runtime/safepoint.cpp	2017-08-17 11:34:49.522101348 -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(result == NULL || oopDesc::is_oop(result), "must be oop");
       return_value = Handle(thread(), result);
       assert(Universe::heap()->is_in_or_null(result), "must be heap pointer");
     }