[GR-32352] Switch from JDK 16 to JDK 17

eregon · eregon · commit fe56a822fbbc · 2021-08-18T18:37:13.000Z
PullRequest: truffleruby/2877
diff --git a/common.json b/common.json
@@ -11,19 +11,19 @@
     "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.12+5-jvmci-21.3-b01", "platformspecific": true },
     "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.13+2-jvmci-21.3-b01", "platformspecific": true },
 
-    "oraclejdk16":        {"name": "oraclejdk", "version": "16.0.1+4", "platformspecific": true },
-    "labsjdk-ce-16":      {"name": "labsjdk",   "version": "ce-16.0.2+7-jvmci-21.2-b05", "platformspecific": true },
-    "labsjdk-ce-16Debug": {"name": "labsjdk",   "version": "ce-16.0.2+7-jvmci-21.2-b05-debug", "platformspecific": true },
-    "labsjdk-ee-16":      {"name": "labsjdk",   "version": "ee-16.0.2+7-jvmci-21.2-b05", "platformspecific": true },
-    "labsjdk-ee-16Debug": {"name": "labsjdk",   "version": "ee-16.0.2+7-jvmci-21.2-b05-debug", "platformspecific": true }
+    "oraclejdk17":        {"name": "oraclejdk", "version": "17.0.1+2", "platformspecific": true },
+    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17+26-jvmci-21.3-b01", "platformspecific": true },
+    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17+26-jvmci-21.3-b01-debug", "platformspecific": true },
+    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.1+1-jvmci-21.3-b01", "platformspecific": true },
+    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.1+1-jvmci-21.3-b01-debug", "platformspecific": true }
   },
 
   "COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
   "devkits": {
       "windows-oraclejdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
       "windows-openjdk8":   { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
       "windows-jdk11":      { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
-      "windows-jdk16":      { "packages" : { "devkit:VS2019-16.7.2+1"  : "==1" }}
+      "windows-jdk17":      { "packages" : { "devkit:VS2019-16.9.3+1"  : "==0" }}
   },
   "deps": {
     "common": {
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -1,13 +1,13 @@
 suite = {
-    "mxversion": "5.302.0",
+    "mxversion": "5.309.0",
     "name": "truffleruby",
 
     "imports": {
         "suites": [
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "3ecf62bb01af00121fad8f9b7b13ef5740e0695e",
+                "version": "619ab20d4a1ed0a1acb4b18f47f6913008c7adbc",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "3ecf62bb01af00121fad8f9b7b13ef5740e0695e",
+                "version": "619ab20d4a1ed0a1acb4b18f47f6913008c7adbc",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
diff --git a/src/main/java/org/truffleruby/builtins/YieldingCoreMethodNode.java b/src/main/java/org/truffleruby/builtins/YieldingCoreMethodNode.java
@@ -16,7 +16,7 @@ public abstract class YieldingCoreMethodNode extends CoreMethodArrayArgumentsNod
 
     @Child private CallBlockNode yieldNode = CallBlockNode.create();
 
-    // Not called yield() because that warns in JDK16
+    // Not called yield() because that warns in Java 13+
     public Object callBlock(RubyProc block, Object... arguments) {
         return yieldNode.yield(block, arguments);
     }
diff --git a/src/processor/java/org/truffleruby/processor/CoreModuleChecks.java b/src/processor/java/org/truffleruby/processor/CoreModuleChecks.java
@@ -19,11 +19,9 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import com.oracle.truffle.api.dsl.CachedLanguage;
 import org.truffleruby.builtins.CoreMethod;
 
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.CachedContext;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
 
@@ -214,9 +212,7 @@ private static int getLastParameterIndex(List<? extends VariableElement> paramet
         // Ignore all the @Cached methods from our consideration.
         while (n >= 0 &&
                 (parameters.get(n).getAnnotation(Cached.class) != null ||
-                        parameters.get(n).getAnnotation(CachedLibrary.class) != null ||
-                        parameters.get(n).getAnnotation(CachedContext.class) != null ||
-                        parameters.get(n).getAnnotation(CachedLanguage.class) != null)) {
+                        parameters.get(n).getAnnotation(CachedLibrary.class) != null)) {
             n--;
         }
         return n;
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -710,7 +710,7 @@ def help
                                     Default value is --use jvm, therefore all commands run on truffleruby-jvm by default.
                                     The default can be changed with `export RUBY_BIN=RUBY_SELECTOR`
           --silent                  Does not print the command and which Ruby is used
-          --jdk                     Specifies which version of the JDK should be used: 8, 11 (default) or 16
+          --jdk                     Specifies which version of the JDK should be used: 8, 11 (default) or 17
 
       jt build [graalvm|parser|options] ...   by default it builds graalvm
         jt build [parser|options] [options]
@@ -812,7 +812,7 @@ def help
         OPENSSL_PREFIX                               Where to find OpenSSL headers and libraries
         ECLIPSE_EXE                                  Where to find Eclipse
         SYSTEM_RUBY                                  The Ruby interpreter to run 'jt' itself, when using 'bin/jt'
-        JT_JDK                                       The default JDK version to use: 8, 11 (default) or 16
+        JT_JDK                                       The default JDK version to use: 8, 11 (default) or 17
         JT_ENV                                       The default value for 'jt build --env JT_ENV' and for 'jt --use JT_ENV'
         JT_PROFILE_SUBCOMMANDS                       Print the time each subprocess takes on stderr
     TXT
@@ -2024,8 +2024,8 @@ def install(name, *options)
       jdk_name = ee ? 'oraclejdk8' : 'openjdk8'
     elsif jdk_version == 11
       jdk_name = ee ? 'labsjdk-ee-11' : 'labsjdk-ce-11'
-    elsif jdk_version == 16
-      jdk_name = ee ? 'labsjdk-ee-16' : 'labsjdk-ce-16'
+    elsif jdk_version == 17
+      jdk_name = ee ? 'labsjdk-ee-17' : 'labsjdk-ce-17'
     else
       raise "Unknown JDK version: #{jdk_version}"
     end
@@ -2850,7 +2850,7 @@ def process_pre_args(args)
       end
     end
 
-    raise "Invalid JDK version: #{@jdk_version}" unless [8, 11, 16].include?(@jdk_version)
+    raise "Invalid JDK version: #{@jdk_version}" unless [8, 11, 17].include?(@jdk_version)
 
     if needs_rebuild
       rebuild

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public abstract class YieldingCoreMethodNode extends CoreMethodArrayArgumentsNod`
`16`	`16`
`17`	`17`	`@Child private CallBlockNode yieldNode = CallBlockNode.create();`
`18`	`18`
`19`		`- // Not called yield() because that warns in JDK16`
	`19`	`+ // Not called yield() because that warns in Java 13+`
`20`	`20`	`public Object callBlock(RubyProc block, Object... arguments) {`
`21`	`21`	`return yieldNode.yield(block, arguments);`
`22`	`22`	`}`