[GR-15458] Libgraal jdk13 initial changes.

PullRequest: graal/3600
physicsfamily · May 29, 2019 · f172715 · f172715
2 parents 57fa7b1 + 3546eb5
commit f172715
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -1840,7 +1840,8 @@
         "org.graalvm.compiler.truffle.common.hotspot.libgraal",
       ],
       "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "8",
+      "javaCompliance" : "8+",
+      "javaVersionExclusion" : "11",
       "annotationProcessors" : [
         "truffle:TRUFFLE_DSL_PROCESSOR",
       ],
@@ -1861,7 +1862,8 @@
         "org.graalvm.compiler.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory",
       ],
       "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "8",
+      "javaCompliance" : "8+",
+      "javaVersionExclusion" : "11",
       "annotationProcessors" : [
         "GRAAL_OPTIONS_PROCESSOR",
         "TRUFFLE_LIBGRAAL_PROCESSOR",
@@ -1878,7 +1880,8 @@
         "org.graalvm.compiler.truffle.common.hotspot.libgraal",
       ],
       "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "8",
+      "javaCompliance" : "8+",
+      "javaVersionExclusion" : "11",
       "workingSets" : "Graal,Truffle",
     },
 

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -1,5 +1,5 @@
 suite = {
-    "mxversion": "5.218.0",
+    "mxversion": "5.218.2",
     "name": "substratevm",
     "version" : "20.0.0-beta.01",
     "release" : False,
@@ -656,7 +656,8 @@
                 "compiler:GRAAL"
             ],
             "checkstyle" : "com.oracle.svm.hosted",
-            "javaCompliance": "1.8",
+            "javaCompliance": "8+",
+            "javaVersionExclusion": "11",
             "annotationProcessors": [
                 "compiler:GRAAL_NODEINFO_PROCESSOR",
                 "compiler:GRAAL_REPLACEMENTS_PROCESSOR",
@@ -812,6 +813,8 @@
         "GRAAL_HOTSPOT_LIBRARY": {
             "subDir": "src",
             "description" : "SubstrateVM HotSpot Graal library support",
+            "javaCompliance": "8+",
+            "javaVersionExclusion": "11",
             "dependencies": [
                 "com.oracle.svm.graal.hotspot.libgraal",
             ],

diff --git a/...svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java b/...svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
@@ -198,7 +198,7 @@ static class JNIConfigSource implements AutoCloseable {
             }
             configFilePath = Paths.get("libgraal_jniconfig.txt");
 
-            String[] command = {javaExe.toFile().getAbsolutePath(), "-XX:JVMCILibDumpJNIConfig=" + configFilePath};
+            String[] command = {javaExe.toFile().getAbsolutePath(), "-XX:+UnlockExperimentalVMOptions", "-XX:+EnableJVMCI", "-XX:JVMCILibDumpJNIConfig=" + configFilePath};
             quotedCommand = Arrays.asList(command).stream().map(e -> e.indexOf(' ') == -1 ? e : '\'' + e + '\'').collect(Collectors.joining(" "));
             ProcessBuilder pb = new ProcessBuilder(command);
             pb.redirectErrorStream(true);

diff --git a/vm/mx.vm/mx_vm.py b/vm/mx.vm/mx_vm.py
@@ -2120,7 +2120,7 @@ def check_versions(jdk_dir, jdk_version_regex, graalvm_version_regex, expect_gra
     match = jdk_version_regex.match(out)
     if match is None:
         mx.abort("'{}' has an unexpected version string:\n{}\ndoes not match:\n{}".format(jdk_dir, out, jdk_version_regex.pattern))
-    elif not (match.group('jvm_version').startswith("1.8.0") or match.group('jvm_version').startswith("11")):
+    elif not (match.group('jvm_version').startswith("1.8.0") or match.group('jvm_version').startswith("11") or match.group('jvm_version').startswith("13")):
         mx.abort("GraalVM requires a JDK8 or JDK11 as base-JDK, while the selected JDK ('{}') is '{}':\n{}\n{}.".format(jdk_dir, match.group('jvm_version'), out, check_env))
 
     match = graalvm_version_regex.match(out)