--- a/src/hotspot/share/oops/instanceKlass.cpp	Tue Jun 26 12:29:20 2018 -0700
+++ b/src/hotspot/share/oops/instanceKlass.cpp	Tue Jun 26 13:54:19 2018 +0200
@@ -3430,7 +3430,7 @@
 
 // Verification
 
-class VerifyFieldClosure: public OopClosure {
+class VerifyFieldClosure: public BasicOopIterateClosure {
  protected:
   template <class T> void do_oop_work(T* p) {
     oop obj = RawAccess<>::oop_load(p);
@@ -3578,7 +3578,7 @@
 void InstanceKlass::oop_verify_on(oop obj, outputStream* st) {
   Klass::oop_verify_on(obj, st);
   VerifyFieldClosure blk;
-  obj->oop_iterate_no_header(&blk);
+  obj->oop_iterate(&blk);
 }