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

rev 12506 : 8171238: Unify cleanup code used in G1 Remark and Full GC marking
Reviewed-by:
rev 12507 : [mq]: 8171238-rev-tsch

*** 1771,1781 ****
  
    // Unload Klasses, String, Symbols, Code Cache, etc.
    if (ClassUnloadingWithConcurrentMark) {
      GCTraceTime(Debug, gc, phases) debug("Class Unloading", _gc_timer_cm);
      bool purged_classes = SystemDictionary::do_unloading(&g1_is_alive, false /* Defer klass cleaning */);
!     g1h->full_cleaning(&g1_is_alive, purged_classes);
    } else {
      GCTraceTime(Debug, gc, phases) debug("Cleanup", _gc_timer_cm);
      // No need to clean string table and symbol table as they are treated as strong roots when
      // class unloading is disabled.
      g1h->partial_cleaning(&g1_is_alive, false, false, G1StringDedup::is_enabled());
--- 1771,1781 ----
  
    // Unload Klasses, String, Symbols, Code Cache, etc.
    if (ClassUnloadingWithConcurrentMark) {
      GCTraceTime(Debug, gc, phases) debug("Class Unloading", _gc_timer_cm);
      bool purged_classes = SystemDictionary::do_unloading(&g1_is_alive, false /* Defer klass cleaning */);
!     g1h->complete_cleaning(&g1_is_alive, purged_classes);
    } else {
      GCTraceTime(Debug, gc, phases) debug("Cleanup", _gc_timer_cm);
      // No need to clean string table and symbol table as they are treated as strong roots when
      // class unloading is disabled.
      g1h->partial_cleaning(&g1_is_alive, false, false, G1StringDedup::is_enabled());