Use nodes for strftime

Author: chrisseaton

src/main/java/org/truffleruby/core/time/RubyDateFormatter.java

@@ -65,15 +65,13 @@
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.exception.ErrnoErrorNode;
 import org.truffleruby.core.rope.CodeRange;
-import org.truffleruby.core.rope.ConcatRope;
 import org.truffleruby.core.rope.LazyIntRope;
 import org.truffleruby.core.rope.LeafRope;
-import org.truffleruby.core.rope.ManagedRope;
 import org.truffleruby.core.rope.Rope;
 import org.truffleruby.core.rope.RopeBuilder;
 import org.truffleruby.core.rope.RopeConstants;
+import org.truffleruby.core.rope.RopeNodes;
 import org.truffleruby.core.rope.RopeOperations;
-import org.truffleruby.core.rope.SubstringRope;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.language.backtrace.Backtrace;
@@ -614,12 +612,12 @@ public static boolean formatToRopeBuilderCanBeFast(Token[] compiledPattern) {
     }
 
     @ExplodeLoop
-    public static ManagedRope formatToRopeBuilderFast(Token[] compiledPattern, ZonedDateTime dt, Object zone,
-            RubyContext context, RubyLanguage language, Node currentNode, ErrnoErrorNode errnoErrorNode) {
-        ManagedRope rope = null;
+    public static Rope formatToRopeBuilderFast(Token[] compiledPattern, ZonedDateTime dt,
+            RopeNodes.ConcatNode concatNode, RopeNodes.SubstringNode substringNode) {
+        Rope rope = null;
 
         for (Token token : compiledPattern) {
-            final ManagedRope appendRope;
+            final Rope appendRope;
 
             switch (token.getFormat()) {
                 case FORMAT_ENCODING:
@@ -657,36 +655,30 @@ public static ManagedRope formatToRopeBuilderFast(Token[] compiledPattern, Zoned
 
                 case FORMAT_NANOSEC: {
                     final int nano = dt.getNano();
-                    assert nano >= 0;
-                    assert nano < 1000000000;
-
                     final LazyIntRope nanoRope = new LazyIntRope(nano);
 
-                    final int padding = 6 - nanoRope.characterLength();
+                    final int length = 6;
+                    final int padding = length - nanoRope.characterLength();
 
                     if (padding == 0) {
                         appendRope = nanoRope;
                     } else if (padding < 0) {
-                        appendRope = new SubstringRope(UTF8Encoding.INSTANCE, nanoRope, 0, 6, 6, CodeRange.CR_7BIT);
+                        appendRope = substringNode.executeSubstring(nanoRope, 0, length);
                     } else {
-                        appendRope = new ConcatRope(
-                                nanoRope,
-                                RopeConstants.paddingZeros(padding),
-                                UTF8Encoding.INSTANCE,
-                                CodeRange.CR_7BIT);
+                        appendRope = concatNode
+                                .executeConcat(nanoRope, RopeConstants.paddingZeros(padding), UTF8Encoding.INSTANCE);
                     }
                 }
                     break;
 
                 default:
-                    CompilerDirectives.shouldNotReachHere();
-                    throw new UnsupportedOperationException();
+                    throw CompilerDirectives.shouldNotReachHere();
             }
 
             if (rope == null) {
                 rope = appendRope;
             } else {
-                rope = new ConcatRope(rope, appendRope, UTF8Encoding.INSTANCE, CodeRange.CR_UNKNOWN);
+                rope = concatNode.executeConcat(rope, appendRope, UTF8Encoding.INSTANCE);
             }
         }
 

src/main/java/org/truffleruby/core/time/TimeNodes.java

@@ -28,7 +28,6 @@
 import org.truffleruby.core.exception.ErrnoErrorNode;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.rope.CodeRange;
-import org.truffleruby.core.rope.ManagedRope;
 import org.truffleruby.core.rope.Rope;
 import org.truffleruby.core.rope.RopeBuilder;
 import org.truffleruby.core.rope.RopeNodes;
@@ -424,9 +423,15 @@ protected RubyString timeStrftime(VirtualFrame frame, RubyTime time, Object form
                 @Cached(value = "compilePattern(cachedFormat)", dimensions = 1) Token[] pattern,
                 @Cached RopeNodes.EqualNode equalNode,
                 @Cached("formatToRopeBuilderCanBeFast(pattern)") boolean canUseFast,
-                @Cached ConditionProfile yearIsFastProfile) {
+                @Cached ConditionProfile yearIsFastProfile,
+                @Cached RopeNodes.ConcatNode concatNode,
+                @Cached RopeNodes.SubstringNode substringNode) {
             if (canUseFast && yearIsFastProfile.profile(yearIsFast(time))) {
-                return makeStringNode.fromRope(formatTimeFast(time, pattern));
+                return makeStringNode.fromRope(RubyDateFormatter.formatToRopeBuilderFast(
+                        pattern,
+                        time.dateTime,
+                        concatNode,
+                        substringNode));
             } else {
                 return makeStringNode.fromBuilderUnsafe(formatTime(time, pattern), CodeRange.CR_UNKNOWN);
             }
@@ -456,16 +461,6 @@ protected Token[] compilePattern(Rope format) {
         }
 
         // Optimised for the default Logger::Formatter time format: "%Y-%m-%dT%H:%M:%S.%6N "
-        private ManagedRope formatTimeFast(RubyTime time, Token[] pattern) {
-            return RubyDateFormatter.formatToRopeBuilderFast(
-                    pattern,
-                    time.dateTime,
-                    time.zone,
-                    getContext(),
-                    getLanguage(),
-                    this,
-                    errnoErrorNode);
-        }
 
         private RopeBuilder formatTime(RubyTime time, Token[] pattern) {
             return RubyDateFormatter.formatToRopeBuilder(