--- old/src/hotspot/share/memory/iterator.inline.hpp	2017-09-25 13:08:50.071768191 -0400
+++ new/src/hotspot/share/memory/iterator.inline.hpp	2017-09-25 13:08:49.645938822 -0400
@@ -37,10 +37,8 @@
 #include "utilities/debug.hpp"
 
 inline void MetadataAwareOopClosure::do_cld_nv(ClassLoaderData* cld) {
-  assert(_klass_closure._oop_closure == this, "Must be");
-
   bool claim = true;  // Must claim the class loader data before processing.
-  cld->oops_do(_klass_closure._oop_closure, &_klass_closure, claim);
+  cld->oops_do(this, claim);
 }
 
 inline void MetadataAwareOopClosure::do_klass_nv(Klass* k) {