CheckStringEncodingNode supports DSL inlining + adding inline false to nodes which cannot be migrated

Author: horakivo

src/main/java/org/truffleruby/core/encoding/EncodingNodes.java

@@ -228,8 +228,6 @@ private TruffleString.GetByteCodeRangeNode getCodeRangeNode() {
         protected boolean isStandardEncoding(RubyEncoding encoding) {
             return encoding == Encodings.UTF_8 || encoding == Encodings.US_ASCII || encoding == Encodings.BINARY;
         }
-
-
     }
 
     // MRI: enc_compatible_latter
@@ -799,18 +797,16 @@ protected static RubyEncoding checkEncodingStringString(Object first, Object sec
     }
 
     // MRI: rb_enc_check_str / rb_encoding_check (with RopeWithEncoding arguments)
+    @GenerateInline
+    @GenerateCached(false)
     public abstract static class CheckStringEncodingNode extends RubyBaseNode {
 
-        @NeverDefault
-        public static CheckStringEncodingNode create() {
-            return EncodingNodesFactory.CheckStringEncodingNodeGen.create();
-        }
-
-        public abstract RubyEncoding executeCheckEncoding(AbstractTruffleString first, RubyEncoding firstEncoding,
-                AbstractTruffleString second, RubyEncoding secondEncoding);
+        public abstract RubyEncoding executeCheckEncoding(Node node, AbstractTruffleString first,
+                RubyEncoding firstEncoding, AbstractTruffleString second, RubyEncoding secondEncoding);
 
         @Specialization
-        protected RubyEncoding checkEncoding(
+        protected static RubyEncoding checkEncoding(
+                Node node,
                 AbstractTruffleString first,
                 RubyEncoding firstEncoding,
                 AbstractTruffleString second,
@@ -821,9 +817,10 @@ protected RubyEncoding checkEncoding(
                     secondEncoding);
 
             if (negotiatedEncoding == null) {
-                errorProfile.enter(this);
-                throw new RaiseException(getContext(),
-                        coreExceptions().encodingCompatibilityErrorIncompatible(firstEncoding, secondEncoding, this));
+                errorProfile.enter(node);
+                throw new RaiseException(getContext(node),
+                        coreExceptions(node).encodingCompatibilityErrorIncompatible(firstEncoding, secondEncoding,
+                                node));
             }
 
             return negotiatedEncoding;

src/main/java/org/truffleruby/core/string/StringHelperNodes.java

@@ -205,7 +205,7 @@ protected int countFast(Object string, TStringWithEncoding[] args,
                 @Bind("libString.getEncoding(string)") RubyEncoding encoding,
                 @Cached("libString.getEncoding(string)") RubyEncoding cachedEncoding,
                 @Cached(value = "squeeze()", dimensions = 1) boolean[] squeeze,
-                @Cached("findEncoding(libString.getTString(string), libString.getEncoding(string), cachedArgs, checkEncodingNode)") RubyEncoding compatEncoding,
+                @Cached("findEncoding(this, libString.getTString(string), libString.getEncoding(string), cachedArgs, checkEncodingNode)") RubyEncoding compatEncoding,
                 @Cached("makeTables(this, cachedArgs, squeeze, compatEncoding)") StringSupport.TrTables tables,
                 @Cached @Shared TruffleString.GetInternalByteArrayNode byteArrayNode,
                 @Cached @Shared TruffleString.GetByteCodeRangeNode getByteCodeRangeNode) {
@@ -231,7 +231,7 @@ protected int count(Object string, TStringWithEncoding[] tstringsWithEncs,
             var byteArray = byteArrayNode.execute(tstring, encoding.tencoding);
             var codeRange = getByteCodeRangeNode.execute(tstring, encoding.tencoding);
 
-            RubyEncoding enc = findEncoding(tstring, encoding, tstringsWithEncs, checkEncodingNode);
+            RubyEncoding enc = findEncoding(this, tstring, encoding, tstringsWithEncs, checkEncodingNode);
             return countSlow(byteArray, codeRange, tstringsWithEncs, enc);
         }
 
@@ -250,12 +250,13 @@ protected boolean[] squeeze() {
             return new boolean[StringSupport.TRANS_SIZE + 1];
         }
 
-        protected static RubyEncoding findEncoding(AbstractTruffleString tstring, RubyEncoding encoding,
+        protected static RubyEncoding findEncoding(Node node, AbstractTruffleString tstring, RubyEncoding encoding,
                 TStringWithEncoding[] tstringsWithEncs, EncodingNodes.CheckStringEncodingNode checkEncodingNode) {
-            RubyEncoding enc = checkEncodingNode.executeCheckEncoding(tstring, encoding, tstringsWithEncs[0].tstring,
+            RubyEncoding enc = checkEncodingNode.executeCheckEncoding(node, tstring, encoding,
+                    tstringsWithEncs[0].tstring,
                     tstringsWithEncs[0].encoding);
             for (int i = 1; i < tstringsWithEncs.length; i++) {
-                enc = checkEncodingNode.executeCheckEncoding(tstring, encoding, tstringsWithEncs[i].tstring,
+                enc = checkEncodingNode.executeCheckEncoding(node, tstring, encoding, tstringsWithEncs[i].tstring,
                         tstringsWithEncs[i].encoding);
             }
             return enc;
@@ -334,12 +335,12 @@ public abstract static class DeleteBangStringsNode extends TrTableNode {
                 limit = "getDefaultCacheLimit()")
         protected static Object deleteBangFast(Node node, RubyString string, TStringWithEncoding[] args,
                 @Cached(value = "args", dimensions = 1) TStringWithEncoding[] cachedArgs,
-                @Cached TruffleString.EqualNode equalNode,
+                @Cached(inline = false) TruffleString.EqualNode equalNode,
                 @Cached @Shared EncodingNodes.CheckStringEncodingNode checkEncodingNode,
                 @Cached @Shared RubyStringLibrary libString,
                 @Cached("libString.getEncoding(string)") RubyEncoding cachedEncoding,
                 @Cached(value = "squeeze()", dimensions = 1) boolean[] squeeze,
-                @Cached("findEncoding(libString.getTString(string), libString.getEncoding(string), cachedArgs, checkEncodingNode)") RubyEncoding compatEncoding,
+                @Cached("findEncoding(node, libString.getTString(string), libString.getEncoding(string), cachedArgs, checkEncodingNode)") RubyEncoding compatEncoding,
                 @Cached("makeTables(node, cachedArgs, squeeze, compatEncoding)") StringSupport.TrTables tables,
                 @Cached @Exclusive InlinedBranchProfile nullProfile) {
             var processedTString = processStr(node, string, squeeze, compatEncoding, tables);
@@ -362,7 +363,8 @@ protected static Object deleteBangSlow(Node node, RubyString string, TStringWith
                 throw new RaiseException(getContext(node), coreExceptions(node).argumentErrorEmptyVarargs(node));
             }
 
-            RubyEncoding enc = findEncoding(string.tstring, libString.getEncoding(string), args, checkEncodingNode);
+            RubyEncoding enc = findEncoding(node, string.tstring, libString.getEncoding(string), args,
+                    checkEncodingNode);
 
             return deleteBangSlow(node, string, args, enc);
         }
@@ -622,22 +624,23 @@ public static StringAppendNode create() {
         public abstract RubyString executeStringAppend(Object string, Object other);
 
         @Specialization(guards = "libOther.isRubyString(other)", limit = "1")
-        protected RubyString stringAppend(Object string, Object other,
+        protected static RubyString stringAppend(Object string, Object other,
                 @Cached RubyStringLibrary libString,
                 @Cached RubyStringLibrary libOther,
                 @Cached EncodingNodes.CheckStringEncodingNode checkEncodingNode,
-                @Cached TruffleString.ConcatNode concatNode) {
+                @Cached TruffleString.ConcatNode concatNode,
+                @Bind("this") Node node) {
 
             var left = libString.getTString(string);
             var leftEncoding = libString.getEncoding(string);
             var right = libOther.getTString(other);
             var rightEncoding = libOther.getEncoding(other);
 
-            final RubyEncoding compatibleEncoding = checkEncodingNode.executeCheckEncoding(left, leftEncoding,
+            final RubyEncoding compatibleEncoding = checkEncodingNode.executeCheckEncoding(node, left, leftEncoding,
                     right, rightEncoding);
 
             var result = concatNode.execute(left, right, compatibleEncoding.tencoding, true);
-            return createString(result, compatibleEncoding);
+            return createString(node, result, compatibleEncoding);
         }
     }
 

src/main/java/org/truffleruby/core/string/StringNodes.java

@@ -777,8 +777,8 @@ protected static Object caseCmpSingleByte(Node node, Object string, Object other
                 @Bind("libString.getEncoding(string)") RubyEncoding selfEncoding,
                 @Bind("libOther.getTString(other)") AbstractTruffleString otherTString,
                 @Bind("libOther.getEncoding(other)") RubyEncoding otherEncoding,
-                @Cached TruffleString.GetInternalByteArrayNode byteArraySelfNode,
-                @Cached TruffleString.GetInternalByteArrayNode byteArrayOtherNode) {
+                @Cached(inline = false) TruffleString.GetInternalByteArrayNode byteArraySelfNode,
+                @Cached(inline = false) TruffleString.GetInternalByteArrayNode byteArrayOtherNode) {
             // Taken from org.jruby.RubyString#casecmp19.
 
             final RubyEncoding encoding = negotiateCompatibleEncodingNode.execute(selfTString, selfEncoding,
@@ -1001,7 +1001,7 @@ public abstract static class DeleteBangNode extends RubyBaseNode {
         @Specialization(guards = "args.length == size", limit = "getDefaultCacheLimit()")
         protected static Object deleteBang(Node node, RubyString string, Object[] args,
                 @Cached @Shared ToStrNode toStrNode,
-                @Cached @Shared AsTruffleStringNode asTruffleStringNode,
+                @Cached(inline = false) @Shared AsTruffleStringNode asTruffleStringNode,
                 @Cached @Shared DeleteBangStringsNode deleteBangStringsNode,
                 @Cached @Shared RubyStringLibrary rubyStringLibrary,
                 @Cached("args.length") int size) {