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

PullRequest: truffleruby/4286
oracle · Jun 11, 2024 · 8a9a89c · 8a9a89c
2 parents 7919ce9 + 96de63b
commit 8a9a89c
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 51 deletions.
diff --git a/common.json b/common.json
@@ -8,7 +8,7 @@
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+20-1618", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+25-2038", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk11":        {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "jdk-11.0.11+9", "platformspecific": true, "extrabundles": ["static-libs"] },
 
@@ -45,13 +45,13 @@
     "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true },
     "graalvm-ee-21":      {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+24", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+24-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+24-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+24-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+24-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+24-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+24-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "jdk-23+25", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+25-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+25-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+25-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+25-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+25-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+25-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -20,7 +20,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "e4f0ef33fb2e8d4613856eb5277f1355b990a197",
+                "version": "11f7b2aa55277324decc1377ca06eb61443c4d23",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -29,7 +29,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "e4f0ef33fb2e8d4613856eb5277f1355b990a197",
+                "version": "11f7b2aa55277324decc1377ca06eb61443c4d23",
                 "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/language/RubyBaseRootNode.java b/src/main/java/org/truffleruby/language/RubyBaseRootNode.java
@@ -11,6 +11,7 @@
 
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.FrameDescriptor;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
 import org.truffleruby.RubyContext;
@@ -41,7 +42,7 @@ public boolean isInternal() {
     }
 
     @Override
-    public boolean isCaptureFramesForTrace() {
+    public boolean isCaptureFramesForTrace(Node currentNode) {
         return false;
     }
 

diff --git a/src/main/java/org/truffleruby/language/WarnNode.java b/src/main/java/org/truffleruby/language/WarnNode.java
@@ -11,7 +11,6 @@
 
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.nodes.DenyReplace;
-import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.strings.TruffleString;
 import org.truffleruby.RubyContext;
 import org.truffleruby.core.encoding.Encodings;
@@ -90,11 +89,6 @@ public void warningMessage(SourceSection sourceSection, String message) {
                     DispatchNode.getUncached());
         }
 
-        @Override
-        public NodeCost getCost() {
-            return NodeCost.MEGAMORPHIC;
-        }
-
         @Override
         public boolean isAdoptable() {
             return false;

diff --git a/src/main/java/org/truffleruby/language/arguments/ProfileArgumentNode.java b/src/main/java/org/truffleruby/language/arguments/ProfileArgumentNode.java
@@ -23,14 +23,11 @@
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
-import com.oracle.truffle.api.nodes.NodeCost;
-import com.oracle.truffle.api.nodes.NodeInfo;
 
 import java.util.Objects;
 
 @TypeSystemReference(NoImplicitCastsToLong.class)
 @ImportStatic(CompilerDirectives.class)
-@NodeInfo(cost = NodeCost.NONE)
 @NodeChild(value = "childNode", type = RubyNode.class)
 public abstract class ProfileArgumentNode extends RubyContextSourceNode {
 

diff --git a/src/main/java/org/truffleruby/language/backtrace/BacktraceInterleaver.java b/src/main/java/org/truffleruby/language/backtrace/BacktraceInterleaver.java
@@ -58,7 +58,7 @@ public static boolean isCallBoundary(StackTraceElement element) {
         return (className.equals("com.oracle.truffle.runtime.OptimizedCallTarget") &&
                 methodName.equals("executeRootNode")) ||
                 (className.equals("com.oracle.truffle.api.impl.DefaultCallTarget") &&
-                        methodName.equals("callDirectOrIndirect"));
+                        (methodName.equals("callDirectOrIndirect") || methodName.equals("call")));
     }
 
     private static boolean isIntoRuby(StackTraceElement[] elements, int index) {

diff --git a/src/main/java/org/truffleruby/language/control/ElidableResultNode.java b/src/main/java/org/truffleruby/language/control/ElidableResultNode.java
@@ -16,12 +16,9 @@
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.NodeCost;
-import com.oracle.truffle.api.nodes.NodeInfo;
 
 /** This node has a pair of children. One has side effects and the other returns the result. If the result isn't needed
  * all we execute is the side effects. */
-@NodeInfo(cost = NodeCost.NONE)
 public final class ElidableResultNode extends RubyContextSourceNodeCustomExecuteVoid {
 
     @Child private RubyNode required;

diff --git a/src/main/java/org/truffleruby/language/control/SequenceNode.java b/src/main/java/org/truffleruby/language/control/SequenceNode.java
@@ -15,10 +15,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
-import com.oracle.truffle.api.nodes.NodeCost;
-import com.oracle.truffle.api.nodes.NodeInfo;
 
-@NodeInfo(cost = NodeCost.NONE)
 public final class SequenceNode extends RubyContextSourceNodeCustomExecuteVoid {
 
     @Children private final RubyNode[] body;

diff --git a/src/main/java/org/truffleruby/language/dispatch/InternalRespondToNode.java b/src/main/java/org/truffleruby/language/dispatch/InternalRespondToNode.java
@@ -13,7 +13,6 @@
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.nodes.DenyReplace;
-import com.oracle.truffle.api.nodes.NodeCost;
 import org.truffleruby.core.kernel.KernelNodes.RespondToNode;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.language.RubyBaseNode;
@@ -106,11 +105,6 @@ public boolean execute(Frame frame, Object receiver, String methodName) {
                     LookupMethodNodeGen.getUncached());
         }
 
-        @Override
-        public NodeCost getCost() {
-            return NodeCost.MEGAMORPHIC;
-        }
-
         @Override
         public boolean isAdoptable() {
             return false;

diff --git a/src/main/java/org/truffleruby/language/literal/BooleanLiteralNode.java b/src/main/java/org/truffleruby/language/literal/BooleanLiteralNode.java
@@ -15,11 +15,8 @@
 import org.truffleruby.language.RubyContextSourceNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.NodeCost;
-import com.oracle.truffle.api.nodes.NodeInfo;
 import org.truffleruby.language.RubyNode;
 
-@NodeInfo(cost = NodeCost.NONE)
 public final class BooleanLiteralNode extends RubyContextSourceNode {
 
     private final boolean value;

diff --git a/src/main/java/org/truffleruby/language/literal/FloatLiteralNode.java b/src/main/java/org/truffleruby/language/literal/FloatLiteralNode.java
@@ -12,11 +12,8 @@
 import org.truffleruby.language.RubyContextSourceNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.NodeCost;
-import com.oracle.truffle.api.nodes.NodeInfo;
 import org.truffleruby.language.RubyNode;
 
-@NodeInfo(cost = NodeCost.NONE)
 public final class FloatLiteralNode extends RubyContextSourceNode {
 
     private final double value;

diff --git a/src/main/java/org/truffleruby/language/literal/IntegerFixnumLiteralNode.java b/src/main/java/org/truffleruby/language/literal/IntegerFixnumLiteralNode.java
@@ -12,11 +12,8 @@
 import org.truffleruby.language.RubyContextSourceNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.NodeCost;
-import com.oracle.truffle.api.nodes.NodeInfo;
 import org.truffleruby.language.RubyNode;
 
-@NodeInfo(cost = NodeCost.NONE)
 public final class IntegerFixnumLiteralNode extends RubyContextSourceNode {
 
     private final int value;

diff --git a/src/main/java/org/truffleruby/language/literal/LongFixnumLiteralNode.java b/src/main/java/org/truffleruby/language/literal/LongFixnumLiteralNode.java
@@ -13,11 +13,8 @@
 import org.truffleruby.language.RubyContextSourceNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.NodeCost;
-import com.oracle.truffle.api.nodes.NodeInfo;
 import org.truffleruby.language.RubyNode;
 
-@NodeInfo(cost = NodeCost.NONE)
 public final class LongFixnumLiteralNode extends RubyContextSourceNode {
 
     private final long value;

diff --git a/src/main/java/org/truffleruby/language/literal/NilLiteralNode.java b/src/main/java/org/truffleruby/language/literal/NilLiteralNode.java
@@ -15,11 +15,8 @@
 import org.truffleruby.language.RubyContextSourceNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.NodeCost;
-import com.oracle.truffle.api.nodes.NodeInfo;
 import org.truffleruby.language.RubyNode;
 
-@NodeInfo(cost = NodeCost.NONE)
 public final class NilLiteralNode extends RubyContextSourceNode {
 
     @Override

diff --git a/src/main/java/org/truffleruby/language/literal/ObjectLiteralNode.java b/src/main/java/org/truffleruby/language/literal/ObjectLiteralNode.java
@@ -12,11 +12,8 @@
 import org.truffleruby.language.RubyContextSourceNode;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.NodeCost;
-import com.oracle.truffle.api.nodes.NodeInfo;
 import org.truffleruby.language.RubyNode;
 
-@NodeInfo(cost = NodeCost.NONE)
 public final class ObjectLiteralNode extends RubyContextSourceNode {
 
     private final Object object;