--- old/src/hotspot/share/gc/cms/parOopClosures.inline.hpp	2017-09-25 13:06:12.269937221 -0400
+++ new/src/hotspot/share/gc/cms/parOopClosures.inline.hpp	2017-09-25 13:06:11.842501492 -0400
@@ -126,8 +126,8 @@
           (void)_par_scan_state->trim_queues(10 * ParallelGCThreads);
         }
       }
-      if (is_scanning_a_klass()) {
-        do_klass_barrier();
+      if (is_scanning_a_cld()) {
+        do_cld_barrier();
       } else if (gc_barrier) {
         // Now call parent closure
         par_do_barrier(p);