src/share/vm/gc/g1/g1MarkSweep.cpp

*** 128,142 ****
  
    // Need cleared claim bits for the roots processing
    ClassLoaderDataGraph::clear_claimed_marks();
  
    MarkingCodeBlobClosure follow_code_closure(&GenMarkSweep::follow_root_closure, !CodeBlobToOopClosure::FixRelocations);
!   {
      G1RootProcessor root_processor(g1h, 1);
      root_processor.process_strong_roots(&GenMarkSweep::follow_root_closure,
                                          &GenMarkSweep::follow_cld_closure,
                                          &follow_code_closure);
    }
  
    {
      GCTraceTime(Debug, gc, phases) trace("Reference Processing", gc_timer());
  
--- 128,147 ----
  
    // Need cleared claim bits for the roots processing
    ClassLoaderDataGraph::clear_claimed_marks();
  
    MarkingCodeBlobClosure follow_code_closure(&GenMarkSweep::follow_root_closure, !CodeBlobToOopClosure::FixRelocations);
!   if (ClassUnloading) {
      G1RootProcessor root_processor(g1h, 1);
      root_processor.process_strong_roots(&GenMarkSweep::follow_root_closure,
                                          &GenMarkSweep::follow_cld_closure,
                                          &follow_code_closure);
+   } else {
+     G1RootProcessor root_processor(g1h, 1);
+     root_processor.process_all_roots(&GenMarkSweep::follow_root_closure,
+                                      &GenMarkSweep::follow_cld_closure,
+                                      &follow_code_closure);
    }
  
    {
      GCTraceTime(Debug, gc, phases) trace("Reference Processing", gc_timer());
  
*** 155,165 ****
    }
  
    // This is the point where the entire marking should have completed.
    assert(GenMarkSweep::_marking_stack.is_empty(), "Marking should have completed");
  
!   {
      GCTraceTime(Debug, gc, phases) trace("Class Unloading", gc_timer());
  
      // Unload classes and purge the SystemDictionary.
      bool purged_class = SystemDictionary::do_unloading(&GenMarkSweep::is_alive);
  
--- 160,170 ----
    }
  
    // This is the point where the entire marking should have completed.
    assert(GenMarkSweep::_marking_stack.is_empty(), "Marking should have completed");
  
!   if (ClassUnloading) {
      GCTraceTime(Debug, gc, phases) trace("Class Unloading", gc_timer());
  
      // Unload classes and purge the SystemDictionary.
      bool purged_class = SystemDictionary::do_unloading(&GenMarkSweep::is_alive);