diff -r f9ae777f71ee -r 6da12aa23b88 src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
--- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp	Tue Jun 26 12:29:20 2018 -0700
+++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp	Tue Jun 26 13:54:19 2018 +0200
@@ -2435,7 +2435,7 @@
   }
 };
 
-class VerifyAllOopsClosure: public OopClosure {
+class VerifyAllOopsClosure: public BasicOopIterateClosure {
  private:
   const CMSCollector*             _collector;
   const CompactibleFreeListSpace* _sp;
@@ -2524,9 +2524,8 @@
     VerifyAllOopsClosure cl(_collector, this, span, past_remark,
       _collector->markBitMap());
 
-    // Iterate over all oops in the heap. Uses the _no_header version
-    // since we are not interested in following the klass pointers.
-    CMSHeap::heap()->oop_iterate_no_header(&cl);
+    // Iterate over all oops in the heap.
+    CMSHeap::heap()->oop_iterate(&cl);
   }
 
   if (VerifyObjectStartArray) {