Convert NormalizeIndexNode to DSL inlinable node

Author: horakivo

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

@@ -443,19 +443,16 @@ static int checkIndex(Node node, int index, int length,
 
     }
 
+    @GenerateInline
+    @GenerateCached(false)
     public abstract static class NormalizeIndexNode extends RubyBaseNode {
 
-        @NeverDefault
-        public static NormalizeIndexNode create() {
-            return StringHelperNodesFactory.NormalizeIndexNodeGen.create();
-        }
-
-        public abstract int executeNormalize(int index, int length);
+        public abstract int executeNormalize(Node node, int index, int length);
 
         @Specialization
-        int normalizeIndex(int index, int length,
+        static int normalizeIndex(Node node, int index, int length,
                 @Cached InlinedConditionProfile negativeIndexProfile) {
-            if (negativeIndexProfile.profile(this, index < 0)) {
+            if (negativeIndexProfile.profile(node, index < 0)) {
                 return index + length;
             }
 

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

@@ -1406,19 +1406,18 @@ static RubyString forceEncoding(RubyString string, Object newEncoding,
     @CoreMethod(names = "getbyte", required = 1, lowerFixnum = 1)
     public abstract static class StringGetByteNode extends CoreMethodArrayArgumentsNode {
 
-        @Child private StringHelperNodes.NormalizeIndexNode normalizeIndexNode = StringHelperNodes.NormalizeIndexNode
-                .create();
         @Child private TruffleString.ReadByteNode readByteNode = TruffleString.ReadByteNode.create();
 
         @Specialization
         Object getByte(Object string, int index,
                 @Cached InlinedConditionProfile indexOutOfBoundsProfile,
-                @Cached RubyStringLibrary libString) {
+                @Cached RubyStringLibrary libString,
+                @Cached StringHelperNodes.NormalizeIndexNode normalizeIndexNode) {
             var tstring = libString.getTString(string);
             var encoding = libString.getEncoding(string).tencoding;
             int byteLength = tstring.byteLength(encoding);
 
-            final int normalizedIndex = normalizeIndexNode.executeNormalize(index, byteLength);
+            final int normalizedIndex = normalizeIndexNode.executeNormalize(this, index, byteLength);
 
             if (indexOutOfBoundsProfile.profile(this, (normalizedIndex < 0) || (normalizedIndex >= byteLength))) {
                 return nil;
@@ -3329,18 +3328,16 @@ private static Object[] addSubstring(Node node, CallBlockNode yieldNode, Object[
     @Primitive(name = "string_byte_substring", lowerFixnum = { 1, 2 })
     public abstract static class StringByteSubstringPrimitiveNode extends PrimitiveArrayArgumentsNode {
 
-        @Child private StringHelperNodes.NormalizeIndexNode normalizeIndexNode = StringHelperNodes.NormalizeIndexNode
-                .create();
-
         @Specialization
         Object stringByteSubstring(Object string, int index, NotProvided length,
                 @Cached @Exclusive InlinedConditionProfile indexOutOfBoundsProfile,
                 @Cached @Shared RubyStringLibrary libString,
-                @Cached @Shared TruffleString.SubstringByteIndexNode substringNode) {
+                @Cached @Shared TruffleString.SubstringByteIndexNode substringNode,
+                @Cached @Shared StringHelperNodes.NormalizeIndexNode normalizeIndexNode) {
             var tString = libString.getTString(string);
             var encoding = libString.getEncoding(string);
             final int stringByteLength = tString.byteLength(encoding.tencoding);
-            final int normalizedIndex = normalizeIndexNode.executeNormalize(index, stringByteLength);
+            final int normalizedIndex = normalizeIndexNode.executeNormalize(this, index, stringByteLength);
 
             if (indexOutOfBoundsProfile.profile(this, normalizedIndex < 0 || normalizedIndex >= stringByteLength)) {
                 return nil;
@@ -3355,15 +3352,16 @@ Object stringByteSubstring(Object string, int index, int length,
                 @Cached @Exclusive InlinedConditionProfile indexOutOfBoundsProfile,
                 @Cached @Exclusive InlinedConditionProfile lengthTooLongProfile,
                 @Cached @Shared RubyStringLibrary libString,
-                @Cached @Shared TruffleString.SubstringByteIndexNode substringNode) {
+                @Cached @Shared TruffleString.SubstringByteIndexNode substringNode,
+                @Cached @Shared StringHelperNodes.NormalizeIndexNode normalizeIndexNode) {
             if (negativeLengthProfile.profile(this, length < 0)) {
                 return nil;
             }
 
             var tString = libString.getTString(string);
             var encoding = libString.getEncoding(string);
             final int stringByteLength = tString.byteLength(encoding.tencoding);
-            final int normalizedIndex = normalizeIndexNode.executeNormalize(index, stringByteLength);
+            final int normalizedIndex = normalizeIndexNode.executeNormalize(this, index, stringByteLength);
 
             if (indexOutOfBoundsProfile.profile(this, normalizedIndex < 0 || normalizedIndex > stringByteLength)) {
                 return nil;
@@ -4280,7 +4278,8 @@ Object stringSubstringGeneric(Object string, int codePointOffset, int codePointL
                 return nil;
             }
 
-            int normalizedCodePointOffset = normalizeIndexNode.executeNormalize(codePointOffset, stringCodePointLength);
+            int normalizedCodePointOffset = normalizeIndexNode.executeNormalize(this, codePointOffset,
+                    stringCodePointLength);
             if (negativeIndexProfile.profile(this, normalizedCodePointOffset < 0)) {
                 return nil;
             }