src/share/vm/runtime/arguments.cpp

rev 8156 : 8068582: UseSerialGC not always set up properly
Reviewed-by: jmasa, brutisso, sjohanss

*** 1553,1568 ****
--- 1553,1571 ----
      if (should_auto_select_low_pause_collector()) {
        FLAG_SET_ERGO(bool, UseConcMarkSweepGC, true);
      } else {
        FLAG_SET_ERGO(bool, UseParallelGC, true);
      }
+   } else {
+     FLAG_SET_ERGO(bool, UseSerialGC, true);
    }
  }
  
  void Arguments::select_gc() {
    if (!gc_selected()) {
      select_gc_ergonomically();
+     guarantee(gc_selected(), "No GC selected");
    }
  }
  
  void Arguments::set_ergonomics_flags() {
    select_gc();
*** 2084,2097 ****
          "It is not possible to combine the DefNew young collector with the CMS collector.\n");
      return false;
    }
  
    if (UseParNewGC && !UseConcMarkSweepGC) {
-     // !UseConcMarkSweepGC means that we are using serial old gc. Unfortunately we don't
-     // set up UseSerialGC properly, so that can't be used in the check here.
      jio_fprintf(defaultStream::error_stream(),
!         "It is not possible to combine the ParNew young collector with the Serial old collector.\n");
      return false;
    }
  
    return true;
  }
--- 2087,2098 ----
          "It is not possible to combine the DefNew young collector with the CMS collector.\n");
      return false;
    }
  
    if (UseParNewGC && !UseConcMarkSweepGC) {
      jio_fprintf(defaultStream::error_stream(),
!         "It is not possible to combine the ParNew young collector with anything other than the CMS collector.\n");
      return false;
    }
  
    return true;
  }