*** old/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Thu Nov 22 14:37:34 2012
--- new/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Thu Nov 22 14:37:34 2012

*** 493,504 ****
--- 493,505 ----
    // General strong roots.
    {
      ParallelScavengeHeap::ParStrongRootsScope psrs;
      Universe::oops_do(mark_and_push_closure());
      JNIHandles::oops_do(mark_and_push_closure());   // Global (strong) JNI handles
+     CLDToOopClosure mark_and_push_from_cld(mark_and_push_closure());
      CodeBlobToOopClosure each_active_code_blob(mark_and_push_closure(), /*do_marking=*/ true);
!     Threads::oops_do(mark_and_push_closure(), &mark_and_push_from_cld, &each_active_code_blob);
      ObjectSynchronizer::oops_do(mark_and_push_closure());
      FlatProfiler::oops_do(mark_and_push_closure());
      Management::oops_do(mark_and_push_closure());
      JvmtiExport::oops_do(mark_and_push_closure());
      SystemDictionary::always_strong_oops_do(mark_and_push_closure());

*** 582,592 ****
--- 583,594 ----
    ClassLoaderDataGraph::clear_claimed_marks();
  
    // General strong roots.
    Universe::oops_do(adjust_root_pointer_closure());
    JNIHandles::oops_do(adjust_root_pointer_closure());   // Global (strong) JNI handles
!   Threads::oops_do(adjust_root_pointer_closure(), NULL);
!   CLDToOopClosure adjust_from_cld(adjust_root_pointer_closure());
+   Threads::oops_do(adjust_root_pointer_closure(), &adjust_from_cld, NULL);
    ObjectSynchronizer::oops_do(adjust_root_pointer_closure());
    FlatProfiler::oops_do(adjust_root_pointer_closure());
    Management::oops_do(adjust_root_pointer_closure());
    JvmtiExport::oops_do(adjust_root_pointer_closure());
    // SO_AllClasses