[GR-50900] Update to latest graal and workaround ECJ bugs

PullRequest: truffleruby/4136

Author: eregon

ci/common.jsonnet

@@ -116,6 +116,8 @@ local common_json = import "../common.json";
     "linux-jdk19": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
     "linux-jdk20": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
     "linux-jdk21": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
+    "linux-jdk-latest": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
+    "linux-jdkLatest": self["linux-jdk-latest"],
   },
 
   # Dependencies

common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.6.1",
+  "mx_version": "7.7.3",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
@@ -44,13 +44,13 @@
     "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21.0.1+11-jvmci-23.1-b26-debug", "platformspecific": true },
     "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.1+11-jvmci-23.1-b26-sulong", "platformspecific": true },
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "5", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+5-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+5-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+5-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+5-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+5-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+5-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "23",      "build_id": "6", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-23+6-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-23+6-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-23+6-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-23+6-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-23+6-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-23+6-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

mx.truffleruby/suite.py

@@ -20,7 +20,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "810578a31376cdc3574096fe267d957bb16039aa",
+                "version": "3892951c221d9bed7680b7a9c084c289faf9ff99",
                 "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": "810578a31376cdc3574096fe267d957bb16039aa",
+                "version": "3892951c221d9bed7680b7a9c084c289faf9ff99",
                 "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/core/array/ArrayNodes.java

@@ -45,7 +45,6 @@
 import org.truffleruby.core.array.ArrayEachIteratorNode.ArrayElementConsumerNode;
 import org.truffleruby.core.array.ArrayIndexNodes.ReadNormalizedNode;
 import org.truffleruby.core.array.ArrayIndexNodes.ReadSliceNormalizedNode;
-import org.truffleruby.core.array.ArrayNodesFactory.ReplaceNodeFactory;
 import org.truffleruby.core.array.library.ArrayStoreLibrary;
 import org.truffleruby.core.array.library.NativeArrayStorage;
 import org.truffleruby.core.array.library.SharedArrayStorage;
@@ -64,7 +63,6 @@
 import org.truffleruby.core.kernel.KernelNodes;
 import org.truffleruby.core.kernel.KernelNodes.SameOrEqlNode;
 import org.truffleruby.core.kernel.KernelNodes.SameOrEqualNode;
-import org.truffleruby.core.kernel.KernelNodesFactory;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.numeric.FixnumLowerNode;
 import org.truffleruby.core.proc.RubyProc;
@@ -1103,7 +1101,6 @@ static boolean include(RubyArray array, Object value,
     public abstract static class InitializeNode extends CoreMethodArrayArgumentsNode {
 
         @Child private DispatchNode toAryNode;
-        @Child private KernelNodes.RespondToNode respondToToAryNode;
 
         protected abstract RubyArray executeInitialize(RubyArray array, Object size, Object fillingValue,
                 Object block);
@@ -1244,9 +1241,10 @@ RubyArray initializeFromArray(RubyArray array, RubyArray copy, NotProvided unuse
         @Specialization(
                 guards = { "!isImplicitLong(object)", "wasProvided(object)", "!isRubyArray(object)" })
         RubyArray initialize(RubyArray array, Object object, NotProvided unusedValue, Nil block,
+                @Cached KernelNodes.RespondToNode respondToNode,
                 @Cached @Shared ToIntNode toIntNode) {
             RubyArray copy = null;
-            if (respondToToAry(object)) {
+            if (respondToNode.executeDoesRespondTo(object, coreSymbols().TO_ARY, true)) {
                 Object toAryResult = callToAry(object);
                 if (toAryResult instanceof RubyArray) {
                     copy = (RubyArray) toAryResult;
@@ -1261,14 +1259,6 @@ RubyArray initialize(RubyArray array, Object object, NotProvided unusedValue, Ni
             }
         }
 
-        public boolean respondToToAry(Object object) {
-            if (respondToToAryNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                respondToToAryNode = insert(KernelNodesFactory.RespondToNodeFactory.create());
-            }
-            return respondToToAryNode.executeDoesRespondTo(object, coreSymbols().TO_ARY, true);
-        }
-
         protected Object callToAry(Object object) {
             if (toAryNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -1786,7 +1776,7 @@ public abstract static class ReplaceNode extends CoreMethodNode {
 
         @NeverDefault
         public static ReplaceNode create() {
-            return ReplaceNodeFactory.create(null, null);
+            return ArrayNodesFactory.ReplaceNodeFactory.create(null, null);
         }
 
         public abstract RubyArray executeReplace(RubyArray array, RubyArray other);

src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java

@@ -26,7 +26,6 @@
 import org.truffleruby.annotations.Split;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
 import org.truffleruby.builtins.CoreMethodNode;
-import org.truffleruby.core.basicobject.BasicObjectNodesFactory.InstanceExecNodeFactory;
 import org.truffleruby.core.cast.BooleanCastNode;
 import org.truffleruby.core.cast.NameToJavaStringNode;
 import org.truffleruby.core.cast.ToIntNode;
@@ -385,14 +384,8 @@ private static LexicalScope prependReceiverClassToScope(LexicalScope callerLexic
     @CoreMethod(names = "instance_exec", needsBlock = true, rest = true)
     public abstract static class InstanceExecNode extends CoreMethodArrayArgumentsNode {
 
-        public static InstanceExecNode create() {
-            return InstanceExecNodeFactory.create(null);
-        }
-
         @Child private CallBlockNode callBlockNode = CallBlockNode.create();
 
-        abstract Object executeInstanceExec(VirtualFrame frame, Object self, Object[] args, RubyProc block);
-
         @Specialization
         Object instanceExec(VirtualFrame frame, Object receiver, Object[] arguments, RubyProc block) {
             final DeclarationContext declarationContext = new DeclarationContext(

src/main/java/org/truffleruby/core/binding/BindingNodes.java

@@ -55,7 +55,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.source.SourceSection;
 import org.truffleruby.language.locals.WriteFrameSlotNode;
-import org.truffleruby.language.locals.WriteFrameSlotNodeGen;
 import org.truffleruby.parser.BlockDescriptorInfo;
 import org.truffleruby.parser.TranslatorEnvironment;
 
@@ -333,7 +332,7 @@ static Object localVariableSetCached(RubyBinding binding, String name, Object va
                 @Cached("name") String cachedName,
                 @Cached("getFrameDescriptor(binding)") FrameDescriptor cachedFrameDescriptor,
                 @Cached("findFrameSlotOrNull(name, binding.getFrame())") FrameSlotAndDepth cachedFrameSlot,
-                @Cached("createWriteNode(cachedFrameSlot.slot)") WriteFrameSlotNode writeLocalVariableNode) {
+                @Cached(parameters = "cachedFrameSlot.slot") WriteFrameSlotNode writeLocalVariableNode) {
             final MaterializedFrame frame = RubyArguments
                     .getDeclarationFrame(binding.getFrame(), cachedFrameSlot.depth);
             writeLocalVariableNode.executeWrite(frame, value);
@@ -352,7 +351,7 @@ static Object localVariableSetNewCached(RubyBinding binding, String name, Object
                 @Cached("getFrameDescriptor(binding)") FrameDescriptor cachedFrameDescriptor,
                 @Cached("findFrameSlotOrNull(name, binding.getFrame())") FrameSlotAndDepth cachedFrameSlot,
                 @Cached("newFrameDescriptor(cachedFrameDescriptor, name)") FrameDescriptor newDescriptor,
-                @Cached("createWriteNode(NEW_VAR_INDEX)") WriteFrameSlotNode writeLocalVariableNode) {
+                @Cached(parameters = "NEW_VAR_INDEX") WriteFrameSlotNode writeLocalVariableNode) {
             final MaterializedFrame frame = newFrame(binding, newDescriptor);
             writeLocalVariableNode.executeWrite(frame, value);
             return value;
@@ -387,10 +386,6 @@ static Object localVariableSetLastLine(Node node, RubyBinding binding, String na
                     coreExceptions(node).nameError("Bad local variable name", binding, name, node));
         }
 
-        protected static WriteFrameSlotNode createWriteNode(int frameSlot) {
-            return WriteFrameSlotNodeGen.create(frameSlot);
-        }
-
         protected int getCacheLimit() {
             return getLanguage().options.BINDING_LOCAL_VARIABLE_CACHE;
         }

src/main/java/org/truffleruby/core/hash/HashNodes.java

@@ -28,8 +28,6 @@
 import org.truffleruby.core.array.ArrayBuilderNode.BuilderState;
 import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
-import org.truffleruby.core.hash.HashNodesFactory.CopyHashAndSetRuby2KeywordsNodeGen;
-import org.truffleruby.core.hash.HashNodesFactory.InitializeCopyNodeFactory;
 import org.truffleruby.core.hash.library.EmptyHashStore;
 import org.truffleruby.core.hash.library.HashStoreLibrary;
 import org.truffleruby.core.hash.library.HashStoreLibrary.EachEntryCallback;
@@ -172,7 +170,7 @@ public abstract static class CopyHashAndSetRuby2KeywordsNode extends RubyBaseNod
 
         @NeverDefault
         public static CopyHashAndSetRuby2KeywordsNode create() {
-            return CopyHashAndSetRuby2KeywordsNodeGen.create();
+            return HashNodesFactory.CopyHashAndSetRuby2KeywordsNodeGen.create();
         }
 
         public abstract RubyHash execute(RubyHash self, boolean ruby2_keywords);
@@ -419,7 +417,7 @@ public abstract static class InitializeCopyNode extends CoreMethodArrayArguments
 
         @NeverDefault
         public static InitializeCopyNode create() {
-            return InitializeCopyNodeFactory.create(null);
+            return HashNodesFactory.InitializeCopyNodeFactory.create(null);
         }
 
         public abstract RubyHash execute(RubyHash self, RubyHash from);

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -85,7 +85,6 @@
 import org.truffleruby.core.support.TypeNodes;
 import org.truffleruby.core.support.TypeNodes.CheckFrozenNode;
 import org.truffleruby.core.support.TypeNodes.ObjectInstanceVariablesNode;
-import org.truffleruby.core.support.TypeNodesFactory.ObjectInstanceVariablesNodeFactory;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.core.symbol.SymbolNodes;
 import org.truffleruby.core.thread.RubyThread;
@@ -126,7 +125,6 @@
 import org.truffleruby.language.objects.FreezeNode;
 import org.truffleruby.language.objects.IsANode;
 import org.truffleruby.language.objects.IsCopyableObjectNode;
-import org.truffleruby.language.objects.IsCopyableObjectNodeGen;
 import org.truffleruby.language.objects.IsFrozenNode;
 import org.truffleruby.language.objects.LazySingletonClassNode;
 import org.truffleruby.language.objects.LogicalClassNode;
@@ -534,10 +532,9 @@ RubyDynamicObject copy(RubyIntOrLongRange range,
     @Primitive(name = "kernel_clone") // "clone"
     public abstract static class CloneNode extends PrimitiveArrayArgumentsNode {
 
-        @Child IsCopyableObjectNode isCopyableObjectNode = IsCopyableObjectNodeGen.create();
-
         @Specialization(guards = "isCopyableObjectNode.execute(object)")
         static RubyDynamicObject copyable(Object object, Object freeze,
+                @Cached @Shared IsCopyableObjectNode isCopyableObjectNode,
                 @Cached MetaClassNode metaClassNode,
                 @Cached CopyNode copyNode,
                 @Cached DispatchNode initializeCloneNode,
@@ -576,6 +573,7 @@ static RubyDynamicObject copyable(Object object, Object freeze,
 
         @Specialization(guards = "!isCopyableObjectNode.execute(object)")
         Object notCopyable(Object object, Object freeze,
+                @Cached @Shared IsCopyableObjectNode isCopyableObjectNode,
                 @Cached InlinedBranchProfile cantUnfreezeErrorProfile) {
             if (forceNotFrozen(freeze)) {
                 raiseCantUnfreezeError(cantUnfreezeErrorProfile, object);
@@ -1084,14 +1082,11 @@ private void removeField(RubyDynamicObject object, String name) {
     @CoreMethod(names = "instance_variables")
     public abstract static class InstanceVariablesNode extends CoreMethodArrayArgumentsNode {
 
-        @Child private ObjectInstanceVariablesNode instanceVariablesNode = ObjectInstanceVariablesNodeFactory
-                .create(null);
-
         @Specialization
-        RubyArray instanceVariables(Object self) {
+        RubyArray instanceVariables(Object self,
+                @Cached ObjectInstanceVariablesNode instanceVariablesNode) {
             return instanceVariablesNode.executeGetIVars(self);
         }
-
     }
 
     @Primitive(name = "any_instance_variable?")

src/main/java/org/truffleruby/core/kernel/TruffleKernelNodes.java

@@ -27,7 +27,6 @@
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
 import org.truffleruby.core.basicobject.RubyBasicObject;
 import org.truffleruby.core.encoding.Encodings;
-import org.truffleruby.core.kernel.TruffleKernelNodesFactory.GetSpecialVariableStorageNodeGen;
 import org.truffleruby.core.module.RubyModule;
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.symbol.RubySymbol;
@@ -213,15 +212,15 @@ public abstract static class GetSpecialVariableStorage extends RubyBaseNode {
 
         @NeverDefault
         public static GetSpecialVariableStorage create() {
-            return GetSpecialVariableStorageNodeGen.create();
+            return TruffleKernelNodesFactory.GetSpecialVariableStorageNodeGen.create();
         }
 
         public final SpecialVariableStorage executeCached(Frame frame) {
             return execute(frame, this);
         }
 
         public static SpecialVariableStorage executeUncached(Frame frame) {
-            return GetSpecialVariableStorageNodeGen.getUncached().execute(frame, null);
+            return TruffleKernelNodesFactory.GetSpecialVariableStorageNodeGen.getUncached().execute(frame, null);
         }
 
         public abstract SpecialVariableStorage execute(Frame frame, Node node);
@@ -367,10 +366,6 @@ public Object shareSlow(MaterializedFrame aFrame, SpecialVariableStorage storage
             // TODO: should invalidate here?
             return nil;
         }
-
-        public static GetSpecialVariableStorage create() {
-            return GetSpecialVariableStorageNodeGen.create();
-        }
     }
 
     @Primitive(name = "regexp_last_match_set")

src/main/java/org/truffleruby/core/klass/ClassNodes.java

@@ -30,10 +30,8 @@
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
 import org.truffleruby.language.objects.InitializeClassNode;
-import org.truffleruby.language.objects.InitializeClassNodeGen;
 import org.truffleruby.language.objects.shared.SharedObjects;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -216,11 +214,11 @@ private static RubyClass getClassClass(RubyClass rubyClass) {
     @Primitive(name = "class_new")
     public abstract static class NewClassNode extends PrimitiveArrayArgumentsNode {
 
-        @Child private InitializeClassNode initializeClassNode;
         private final BranchProfile errorProfile = BranchProfile.create();
 
         @Specialization
-        RubyClass newClass(RubyClass superclass, boolean callInherited, Object maybeBlock) {
+        RubyClass newClass(RubyClass superclass, boolean callInherited, Object maybeBlock,
+                @Cached InitializeClassNode initializeClassNode) {
             if (superclass.isSingleton) {
                 errorProfile.enter();
                 throw new RaiseException(getContext(), coreExceptions().typeErrorSubclassSingletonClass(this));
@@ -240,11 +238,6 @@ RubyClass newClass(RubyClass superclass, boolean callInherited, Object maybeBloc
                     null,
                     superclass);
 
-            if (initializeClassNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                initializeClassNode = insert(InitializeClassNodeGen.create());
-            }
-
             initializeClassNode.executeInitialize(newRubyClass, superclass, callInherited, maybeBlock);
 
             return newRubyClass;