--- old/src/share/vm/gc/g1/g1RemSet.inline.hpp	2017-08-17 11:30:43.177064901 -0400
+++ new/src/share/vm/gc/g1/g1RemSet.inline.hpp	2017-08-17 11:30:42.947991887 -0400
@@ -39,7 +39,7 @@
 
 #ifdef ASSERT
   // can't do because of races
-  // assert(obj == NULL || obj->is_oop(), "expected an oop");
+  // assert(obj == NULL || oopDesc::is_oop(obj), "expected an oop");
   assert(check_obj_alignment(obj), "not oop aligned");
   assert(_g1->is_in_reserved(obj), "must be in heap");
 #endif // ASSERT