src/hotspot/share/gc/shared/gcConfig.cpp

rev 57486 : imported patch 8235860-remove-serial-old-gc

*** 1,7 ****
  /*
!  * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 68,78 ****
  // line flag, CollectedHeap::Name and GCArguments instance.
  static const IncludedGC IncludedGCs[] = {
     EPSILONGC_ONLY_ARG(IncludedGC(UseEpsilonGC,       CollectedHeap::Epsilon,    epsilonArguments,    "epsilon gc"))
          G1GC_ONLY_ARG(IncludedGC(UseG1GC,            CollectedHeap::G1,         g1Arguments,         "g1 gc"))
    PARALLELGC_ONLY_ARG(IncludedGC(UseParallelGC,      CollectedHeap::Parallel,   parallelArguments,   "parallel gc"))
-   PARALLELGC_ONLY_ARG(IncludedGC(UseParallelOldGC,   CollectedHeap::Parallel,   parallelArguments,   "parallel gc"))
      SERIALGC_ONLY_ARG(IncludedGC(UseSerialGC,        CollectedHeap::Serial,     serialArguments,     "serial gc"))
  SHENANDOAHGC_ONLY_ARG(IncludedGC(UseShenandoahGC,    CollectedHeap::Shenandoah, shenandoahArguments, "shenandoah gc"))
           ZGC_ONLY_ARG(IncludedGC(UseZGC,             CollectedHeap::Z,          zArguments,          "z gc"))
  };
  
--- 68,77 ----
*** 91,103 ****
  
  void GCConfig::fail_if_non_included_gc_is_selected() {
    NOT_EPSILONGC(   FAIL_IF_SELECTED(UseEpsilonGC,       true));
    NOT_G1GC(        FAIL_IF_SELECTED(UseG1GC,            true));
    NOT_PARALLELGC(  FAIL_IF_SELECTED(UseParallelGC,      true));
-   NOT_PARALLELGC(  FAIL_IF_SELECTED(UseParallelOldGC,   true));
    NOT_SERIALGC(    FAIL_IF_SELECTED(UseSerialGC,        true));
-   NOT_SERIALGC(    FAIL_IF_SELECTED(UseParallelOldGC,   false));
    NOT_SHENANDOAHGC(FAIL_IF_SELECTED(UseShenandoahGC,    true));
    NOT_ZGC(         FAIL_IF_SELECTED(UseZGC,             true));
  }
  
  void GCConfig::select_gc_ergonomically() {
--- 90,100 ----