--- old/src/share/vm/runtime/javaCalls.cpp	2017-08-17 11:34:34.244717467 -0400
+++ new/src/share/vm/runtime/javaCalls.cpp	2017-08-17 11:34:34.015056688 -0400
@@ -567,7 +567,7 @@
                 "Bad JNI oop argument %d: " PTR_FORMAT, _pos, v);
       // Verify the pointee.
       oop vv = resolve_indirect_oop(v, _value_state[_pos]);
-      guarantee(vv->is_oop_or_null(true),
+      guarantee(oopDesc::is_oop_or_null(vv, true),
                 "Bad JNI oop argument %d: " PTR_FORMAT " -> " PTR_FORMAT,
                 _pos, v, p2i(vv));
     }