[11u] RFR (S) 8207965: C2-only debug build fails

[Aleksey Shipilev]

Original bug:
  https://bugs.openjdk.java.net/browse/JDK-8207965
  https://hg.openjdk.java.net/jdk/jdk/rev/09cc8813ae51

Patch does not apply cleanly, because there are rejections due to already happened backports, see
below. 11u webrev:
  https://cr.openjdk.java.net/~shade/8207965/webrev.11u.01/

Testing: out-of-box build and tier1, --with-jvm-features=-compiler1 build and tier1

Thanks,
-Aleksey

-------

Rejected hunks:

1) Already added by JDK-8215917 backport:

src/hotspot/share/gc/z/zBarrierSet.cpp
@@ -22,8 +22,12 @@
  */

 #include "precompiled.hpp"
+#ifdef COMPILER1
 #include "gc/z/c1/zBarrierSetC1.hpp"
+#endif
+#ifdef COMPILER2
 #include "gc/z/c2/zBarrierSetC2.hpp"
+#endif
 #include "gc/z/zBarrierSet.hpp"

2) Already added by JDK-8219584 backport:

test/hotspot/jtreg/TEST.ROOT.rej
@@ -62,6 +62,8 @@
     vm.cds.custom.loaders \
     vm.cds.archived.java.heap \
     vm.graal.enabled \
+    vm.compiler1.enabled \
+    vm.compiler2.enabled \
     docker.support

test/jdk/TEST.ROOT.rej
@@ -62,6 +62,8 @@
     vm.cds.custom.loaders \
     vm.cds.archived.java.heap \
     vm.graal.enabled \
+    vm.compiler1.enabled \
+    vm.compiler2.enabled \
     docker.support

test/jtreg-ext/requires/VMProps.java
@@ -92,6 +92,8 @@
         map.put("vm.cds.archived.java.heap", vmCDSForArchivedJavaHeap());
         // vm.graal.enabled is true if Graal is used as JIT
         map.put("vm.graal.enabled", isGraalEnabled());
+        map.put("vm.compiler1.enabled", isCompiler1Enabled());
+        map.put("vm.compiler2.enabled", isCompiler2Enabled());
         map.put("docker.support", dockerSupport());
         map.put("release.implementor", implementor());
         vmGC(map); // vm.gc.X = true/false
@@ -390,6 +392,23 @@
         return Compiler.isGraalEnabled() ? "true" : "false";
     }

+    /**
+     * Check if Compiler1 is present.
+     *
+     * @return true if Compiler1 is used as JIT compiler, either alone or as part of the tiered system.
+     */
+    protected String isCompiler1Enabled() {
+        return Compiler.isC1Enabled() ? "true" : "false";
+    }
+
+    /**
+     * Check if Compiler2 is present.
+     *
+     * @return true if Compiler2 is used as JIT compiler, either alone or as part of the tiered system.
+     */
+    protected String isCompiler2Enabled() {
+        return Compiler.isC2Enabled() ? "true" : "false";
+    }

    /**
      * A simple check for docker support