diff -r 39063b484ec2 -r 9119841280f4 hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp
--- a/hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp	Wed Aug 23 10:25:25 2017 +0200
+++ b/hotspot/src/share/vm/gc/g1/g1RemSet.inline.hpp	Wed Aug 23 14:52:55 2017 -0400
@@ -39,7 +39,7 @@
 
 #ifdef ASSERT
   // can't do because of races
-  // assert(obj == NULL || obj->is_oop(), "expected an oop");
+  // assert(oopDesc::is_oop_or_null(obj), "expected an oop");
   assert(check_obj_alignment(obj), "not oop aligned");
   assert(_g1->is_in_reserved(obj), "must be in heap");
 #endif // ASSERT