[GR-14476] Update to jvmci-0.57.

PullRequest: graal/3229

Author: dougxc

.travis.yml

@@ -18,7 +18,7 @@ jdk:
 
 env:
   global:
-    - JVMCI_VERSION="jvmci-0.56"
+    - JVMCI_VERSION="jvmci-0.57"
     - JDK8_UPDATE_VERSION="202"
 
 matrix:

common.hocon

@@ -6,9 +6,9 @@ overlay = a91034428f121e5bc501872343445e4339e95073
 # openjdk8 JDKs on Linux are built by Oracle Labs
 # openjdk8 JDKs on macOS are based on AdoptOpenJDK binaries
 jdks: {
-  labsjdk8:      {name : labsjdk,   version : "8u202-jvmci-0.56", platformspecific: true}
-  openjdk8:      {name : openjdk,   version : "8u202-jvmci-0.56", platformspecific: true}
-  labsjdk8Debug: {name : labsjdk,   version : "8u202-jvmci-0.56-fastdebug", platformspecific: true}
+  labsjdk8:      {name : labsjdk,   version : "8u202-jvmci-0.57", platformspecific: true}
+  openjdk8:      {name : openjdk,   version : "8u202-jvmci-0.57", platformspecific: true}
+  labsjdk8Debug: {name : labsjdk,   version : "8u202-jvmci-0.57-fastdebug", platformspecific: true}
   oraclejdk11:   {name : oraclejdk, version : "11+28", platformspecific: true}
   openjdk11:     {name : openjdk,   version : "11+28", platformspecific: true}
 

compiler/src/org.graalvm.compiler.hotspot.jdk8/src/org/graalvm/compiler/hotspot/IsGraalPredicate.java

@@ -24,35 +24,34 @@
  */
 package org.graalvm.compiler.hotspot;
 
-import static jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory.CompilationLevelAdjustment.ByHolder;
 import static jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory.CompilationLevelAdjustment.None;
 
+import org.graalvm.compiler.debug.GraalError;
+
 import jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory.CompilationLevelAdjustment;
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
 
 /**
  * Determines if a given class is a JVMCI or Graal class for the purpose of
  * {@link HotSpotGraalCompilerFactory.Options#CompileGraalWithC1Only}.
  */
 class IsGraalPredicate extends IsGraalPredicateBase {
-    private final ClassLoader jvmciLoader = getClass().getClassLoader();
+
+    @Override
+    void onCompilerConfigurationFactorySelection(HotSpotJVMCIRuntime runtime, CompilerConfigurationFactory factory) {
+        ClassLoader jvmciLoader = getClass().getClassLoader();
+        if (jvmciLoader != null) {
+            runtime.excludeFromJVMCICompilation(jvmciLoader);
+        }
+    }
 
     @Override
     CompilationLevelAdjustment getCompilationLevelAdjustment() {
-        return jvmciLoader != null ? ByHolder : None;
+        return None;
     }
 
     @Override
     boolean apply(Class<?> declaringClass) {
-        assert jvmciLoader != null;
-        // When running with +UseJVMCIClassLoader all classes loaded
-        // by the JVMCI loader are considered to be Graal classes.
-        try {
-            if (declaringClass.getClassLoader() == jvmciLoader) {
-                return true;
-            }
-        } catch (SecurityException e) {
-            // This is definitely not a JVMCI or Graal class
-        }
-        return false;
+        throw GraalError.shouldNotReachHere();
     }
 }

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java

@@ -41,9 +41,9 @@
  */
 class JVMCIVersionCheck {
 
-    // 0.55 introduces new HotSpotSpeculationLog API
+    // 0.57 introduces HotSpotJVMCIRuntime.excludeFromJVMCICompilation
     private static final int JVMCI8_MIN_MAJOR_VERSION = 0;
-    private static final int JVMCI8_MIN_MINOR_VERSION = 55;
+    private static final int JVMCI8_MIN_MINOR_VERSION = 57;
 
     private static void failVersionCheck(Map<String, String> props, boolean exit, String reason, Object... args) {
         Formatter errorMessage = new Formatter().format(reason, args);
@@ -54,7 +54,9 @@ private static void failVersionCheck(Map<String, String> props, boolean exit, St
         errorMessage.format("Currently used Java home directory is %s.%n", javaHome);
         errorMessage.format("Currently used VM configuration is: %s%n", vmName);
         if (props.get("java.specification.version").compareTo("1.9") < 0) {
-            errorMessage.format("Download the latest JVMCI JDK 8 from http://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html");
+            errorMessage.format("Download the latest JVMCI JDK 8 from " +
+                            "http://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html or " +
+                            "https://github.com/graalvm/openjdk8-jvmci-builder/releases");
         } else {
             errorMessage.format("Download JDK 11 or later.");
         }