--- old/src/hotspot/share/gc/parallel/psTasks.cpp	2017-09-25 13:07:40.211211656 -0400
+++ new/src/hotspot/share/gc/parallel/psTasks.cpp	2017-09-25 13:07:39.782118928 -0400
@@ -79,8 +79,8 @@
 
     case class_loader_data:
     {
-      PSScavengeKlassClosure klass_closure(pm);
-      ClassLoaderDataGraph::oops_do(&roots_closure, &klass_closure, false);
+      PSScavengeCLDClosure ps(pm);
+      ClassLoaderDataGraph::cld_do(&ps);
     }
     break;