[GR-26395] Periodic update of the graal import.

PullRequest: truffleruby/3835

Author: OracleLabsAutomation

ci/common.jsonnet

@@ -22,7 +22,7 @@ local common_json = import "../common.json";
     for name in ["oraclejdk20"] + variants("labsjdk-ce-20") + variants("labsjdk-ee-20")
   } + {
     [name]: common_json.jdks[name] + { jdk_version:: 21 }
-    for name in variants("labsjdk-ce-21") + variants("labsjdk-ee-21")
+    for name in ["oraclejdk21"] + variants("labsjdk-ce-21") + variants("labsjdk-ee-21")
   },
   assert std.assertEqual(std.objectFields(common_json.jdks), std.objectFields(jdks_data)),
 

common.json

@@ -34,12 +34,13 @@
     "labsjdk-ee-20Debug": {"name": "labsjdk",   "version": "ee-20.0.2+2-jvmci-23.1-b02-debug", "platformspecific": true },
     "labsjdk-ee-20-llvm": {"name": "labsjdk",   "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true },
 
-    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21+22-jvmci-23.1-b03", "platformspecific": true },
-    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21+22-jvmci-23.1-b03-debug", "platformspecific": true },
-    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+22-jvmci-23.1-b03-sulong", "platformspecific": true },
-    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21+22-jvmci-23.1-b03", "platformspecific": true },
-    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21+22-jvmci-23.1-b03-debug", "platformspecific": true },
-    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+22-jvmci-23.1-b03-sulong", "platformspecific": true }
+    "oraclejdk21":        {"name": "jpg-jdk",   "version": "21",      "build_id": "23", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21+23-jvmci-23.1-b04", "platformspecific": true },
+    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21+23-jvmci-23.1-b04-debug", "platformspecific": true },
+    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+23-jvmci-23.1-b04-sulong", "platformspecific": true },
+    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21+23-jvmci-23.1-b04", "platformspecific": true },
+    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21+23-jvmci-23.1-b04-debug", "platformspecific": true },
+    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+23-jvmci-23.1-b04-sulong", "platformspecific": true }
 
   },
 

mx.truffleruby/mx_truffleruby.py

@@ -240,7 +240,7 @@ def verify_ci(args):
         'LLVM Runtime Core': ('lib/sulong', []),
         'LLVM Runtime Native': ('lib/sulong', []),
         'LLVM.org toolchain': ('lib/llvm-toolchain', []),
-        'TruffleRuby license files': ('', []),
+        'rbyl': ('', []), # Use short name for license to select by priority
     },
     truffle_jars=[
         # Distributions

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "f3bac55b14efba68af24e04608eab21a518e192d",
+                "version": "faff236da4ee3085721970fcd6de0d187e4fe611",
                 "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": "f3bac55b14efba68af24e04608eab21a518e192d",
+                "version": "faff236da4ee3085721970fcd6de0d187e4fe611",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

src/main/java/org/truffleruby/RubyLanguage.java

@@ -201,7 +201,7 @@ private RubyThread getOrCreateForeignThread(RubyContext context, Thread thread)
     }
 
     public final Map<Thread, RubyThread> rubyThreadInitMap = new ConcurrentHashMap<>();
-    private final ContextThreadLocal<RubyThread> rubyThread = createContextThreadLocal(
+    private final ContextThreadLocal<RubyThread> rubyThread = locals.createContextThreadLocal(
             (context, thread) -> {
                 if (thread == context.getThreadManager().getOrInitializeRootJavaThread()) {
                     // Already initialized when creating the context
@@ -216,7 +216,7 @@ private RubyThread getOrCreateForeignThread(RubyContext context, Thread thread)
             });
 
     public final Map<Thread, RubyFiber> rubyFiberInitMap = new ConcurrentHashMap<>();
-    private final ContextThreadLocal<RubyFiber> rubyFiber = createContextThreadLocal(
+    private final ContextThreadLocal<RubyFiber> rubyFiber = locals.createContextThreadLocal(
             (context, thread) -> {
                 if (thread == context.getThreadManager().getOrInitializeRootJavaThread()) {
                     // Already initialized when creating the context