--- old/src/share/vm/oops/instanceKlass.cpp	2017-08-17 11:32:59.414669225 -0400
+++ new/src/share/vm/oops/instanceKlass.cpp	2017-08-17 11:32:59.082314744 -0400
@@ -3207,7 +3207,7 @@
  protected:
   template <class T> void do_oop_work(T* p) {
     oop obj = oopDesc::load_decode_heap_oop(p);
-    if (!obj->is_oop_or_null()) {
+    if (!oopDesc::is_oop_or_null(obj)) {
       tty->print_cr("Failed: " PTR_FORMAT " -> " PTR_FORMAT, p2i(p), p2i(obj));
       Universe::print_on(tty);
       guarantee(false, "boom");