src/share/vm/gc/serial/genMarkSweep.cpp

rev 11983 : 8166276: Refactor gen_process_roots to allow simpler fix for 8165949
Reviewed-by:
Contributed-by: jesper.wilhelmsson@oracle.com
rev 11985 : 8165949: Serial and ConcMarkSweep do not unload strings when class unloading is disabled
Reviewed-by:
rev 11987 : [mq]: 8165949-on-jesper-stefank-rev

*** 195,208 ****
  
    {
      StrongRootsScope srs(1);
  
      gch->full_process_roots(&srs,
                              ClassUnloading, // only strong roots if ClassUnloading
                                              // is enabled
-                             GenCollectedHeap::SO_None,
-                             false, // not the adjust phase
                              &follow_root_closure,
                              &follow_cld_closure);
    }
  
    // Process reference objects found during marking
--- 195,208 ----
  
    {
      StrongRootsScope srs(1);
  
      gch->full_process_roots(&srs,
+                             false, // not the adjust phase
+                             GenCollectedHeap::SO_None,
                              ClassUnloading, // only strong roots if ClassUnloading
                                              // is enabled
                              &follow_root_closure,
                              &follow_cld_closure);
    }
  
    // Process reference objects found during marking
*** 293,305 ****
  
    {
      StrongRootsScope srs(1);
  
      gch->full_process_roots(&srs,
-                            false, // all roots
-                            GenCollectedHeap::SO_AllCodeCache,
                             true,  // this is the adjust phase
                             &adjust_pointer_closure,
                             &adjust_cld_closure);
    }
  
    gch->gen_process_weak_roots(&adjust_pointer_closure);
--- 293,305 ----
  
    {
      StrongRootsScope srs(1);
  
      gch->full_process_roots(&srs,
                              true,  // this is the adjust phase
+                             GenCollectedHeap::SO_AllCodeCache,
+                             false, // all roots
                              &adjust_pointer_closure,
                              &adjust_cld_closure);
    }
  
    gch->gen_process_weak_roots(&adjust_pointer_closure);