--- a/hotspot/src/share/vm/code/dependencies.cpp	Wed Aug 23 10:25:25 2017 +0200
+++ b/hotspot/src/share/vm/code/dependencies.cpp	Wed Aug 23 14:52:55 2017 -0400
@@ -940,7 +940,7 @@
 
 oop Dependencies::DepStream::argument_oop(int i) {
   oop result = recorded_oop_at(argument_index(i));
-  assert(result == NULL || result->is_oop(), "must be");
+  assert(oopDesc::is_oop_or_null(result), "must be");
   return result;
 }