--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp	Tue Aug 21 13:12:15 2018 +0200
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp	Tue Aug 21 09:33:41 2018 -0400
@@ -2188,7 +2188,8 @@
   Management::oops_do(&oop_closure);
   JvmtiExport::oops_do(&oop_closure);
   SystemDictionary::oops_do(&oop_closure);
-  ClassLoaderDataGraph::oops_do(&oop_closure, true);
+  CLDToOopClosure cld_closure(&oop_closure);
+  ClassLoaderDataGraph::cld_do(&cld_closure);
 
   // Now adjust pointers in remaining weak roots.  (All of which should
   // have been cleared if they pointed to non-surviving objects.)