[GR-15990] ImmutableRubyString fixes.

PullRequest: truffleruby/2219

Author: eregon

src/main/java/org/truffleruby/RubyContext.java

@@ -61,7 +61,7 @@
 import org.truffleruby.extra.ffi.Pointer;
 import org.truffleruby.interop.InteropManager;
 import org.truffleruby.language.CallStackManager;
-import org.truffleruby.language.ImmutableRubyString;
+import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.LexicalScope;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.SafepointManager;

src/main/java/org/truffleruby/RubyLanguage.java

@@ -18,6 +18,7 @@
 import com.oracle.truffle.api.instrumentation.AllocationReporter;
 import com.oracle.truffle.api.object.Shape;
 import org.graalvm.options.OptionDescriptors;
+import org.jcodings.Encoding;
 import org.truffleruby.builtins.PrimitiveManager;
 import org.truffleruby.core.RubyHandle;
 import org.truffleruby.core.array.RubyArray;
@@ -53,7 +54,7 @@
 import org.truffleruby.core.range.RubyObjectRange;
 import org.truffleruby.core.regexp.RubyMatchData;
 import org.truffleruby.core.regexp.RubyRegexp;
-import org.truffleruby.core.rope.LeafRope;
+import org.truffleruby.core.rope.CodeRange;
 import org.truffleruby.core.rope.Rope;
 import org.truffleruby.core.rope.RopeCache;
 import org.truffleruby.core.string.CoreStrings;
@@ -72,7 +73,7 @@
 import org.truffleruby.core.tracepoint.RubyTracePoint;
 import org.truffleruby.extra.RubyAtomicReference;
 import org.truffleruby.extra.ffi.RubyPointer;
-import org.truffleruby.language.ImmutableRubyString;
+import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.NotProvided;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyEvalInteractiveRootNode;
@@ -153,9 +154,9 @@ public final class RubyLanguage extends TruffleLanguage<RubyContext> {
     public final CoreStrings coreStrings;
     public final CoreSymbols coreSymbols;
     public final PrimitiveManager primitiveManager;
-    public final FrozenStringLiterals frozenStringLiterals;
     public final RopeCache ropeCache;
     public final SymbolTable symbolTable;
+    public final FrozenStringLiterals frozenStringLiterals;
     @CompilationFinal public LanguageOptions options;
 
     @CompilationFinal private AllocationReporter allocationReporter;
@@ -212,9 +213,9 @@ public RubyLanguage() {
         coreStrings = new CoreStrings(this);
         coreSymbols = new CoreSymbols();
         primitiveManager = new PrimitiveManager();
-        frozenStringLiterals = new FrozenStringLiterals();
         ropeCache = new RopeCache(coreSymbols);
         symbolTable = new SymbolTable(ropeCache, coreSymbols);
+        frozenStringLiterals = new FrozenStringLiterals(ropeCache);
     }
 
     @TruffleBoundary
@@ -435,7 +436,11 @@ public AllocationReporter getAllocationReporter() {
         return allocationReporter;
     }
 
-    public ImmutableRubyString getFrozenStringLiteral(LeafRope rope) {
+    public ImmutableRubyString getFrozenStringLiteral(byte[] bytes, Encoding encoding, CodeRange codeRange) {
+        return frozenStringLiterals.getFrozenStringLiteral(bytes, encoding, codeRange);
+    }
+
+    public ImmutableRubyString getFrozenStringLiteral(Rope rope) {
         return frozenStringLiterals.getFrozenStringLiteral(rope);
     }
 

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -66,7 +66,7 @@
 import org.truffleruby.interop.InteropNodes;
 import org.truffleruby.interop.ToJavaStringNode;
 import org.truffleruby.interop.TranslateInteropExceptionNode;
-import org.truffleruby.language.ImmutableRubyString;
+import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.LexicalScope;
 import org.truffleruby.language.NotProvided;
 import org.truffleruby.language.RubyContextNode;
@@ -1150,7 +1150,8 @@ protected Object debug(Object... objects) {
 
                     representation = RopeOperations.decodeRope(rope) + " (" + builder.toString() + ")";
                 } else if (RubyGuards.isRubyValue(object)) {
-                    representation = object.toString() + " (" + callToS(object).getJavaString() + ")";
+                    representation = object.toString() + " (" +
+                            RubyStringLibrary.getUncached().getJavaString(callToS(object)) + ")";
                 } else {
                     representation = object.toString();
                 }
@@ -1160,13 +1161,13 @@ protected Object debug(Object... objects) {
             return nil;
         }
 
-        private RubyString callToS(Object object) {
+        private Object callToS(Object object) {
             if (toSCall == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 toSCall = insert(DispatchNode.create());
             }
 
-            return (RubyString) toSCall.call(object, "to_s");
+            return toSCall.call(object, "to_s");
         }
 
     }

src/main/java/org/truffleruby/core/CoreLibrary.java

@@ -44,13 +44,12 @@
 import org.truffleruby.core.numeric.BigIntegerOps;
 import org.truffleruby.core.numeric.RubyBignum;
 import org.truffleruby.core.rope.CodeRange;
-import org.truffleruby.core.rope.LeafRope;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.debug.GlobalVariablesObject;
 import org.truffleruby.debug.TopScopeObject;
 import org.truffleruby.extra.ffi.Pointer;
-import org.truffleruby.language.ImmutableRubyString;
+import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.NotProvided;
 import org.truffleruby.language.RubyRootNode;
@@ -737,10 +736,8 @@ private void setConstant(RubyModule module, String name, Object value) {
     }
 
     private ImmutableRubyString frozenUSASCIIString(String string) {
-        // NOTE(norswap, Nov. 2nd 2020): Okay for language access to be slow, currently only used during initialization.
-        final LeafRope rope = language.ropeCache.getRope(
+        return language.getFrozenStringLiteral(
                 StringOperations.encodeRope(string, USASCIIEncoding.INSTANCE, CodeRange.CR_7BIT));
-        return StringOperations.createFrozenString(rope);
     }
 
     private RubyClass defineClass(String name) {

src/main/java/org/truffleruby/core/TruffleSystemNodes.java

@@ -260,10 +260,11 @@ public static void log(Level level, String message) {
     public abstract static class SetProcessTitleNode extends PrimitiveArrayArgumentsNode {
 
         @TruffleBoundary
-        @Specialization
-        protected RubyString setProcessTitle(RubyString name) {
+        @Specialization(guards = "libString.isRubyString(name)")
+        protected Object setProcessTitle(Object name,
+                @CachedLibrary(limit = "2") RubyStringLibrary libString) {
             if (TruffleOptions.AOT) {
-                ProcessProperties.setArgumentVectorProgramName(name.getJavaString());
+                ProcessProperties.setArgumentVectorProgramName(libString.getJavaString(name));
             } else {
                 // already checked in the caller
                 throw CompilerDirectives.shouldNotReachHere();

src/main/java/org/truffleruby/core/cast/BooleanCastNode.java

@@ -12,7 +12,7 @@
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.numeric.RubyBignum;
 import org.truffleruby.core.symbol.RubySymbol;
-import org.truffleruby.language.ImmutableRubyString;
+import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.RubyDynamicObject;

src/main/java/org/truffleruby/core/cast/StringToSymbolNode.java

@@ -11,7 +11,7 @@
 
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.symbol.RubySymbol;
-import org.truffleruby.language.ImmutableRubyString;
+import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
 

src/main/java/org/truffleruby/core/cast/ToEncodingNode.java

@@ -14,7 +14,7 @@
 import org.truffleruby.core.regexp.RubyRegexp;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.symbol.RubySymbol;
-import org.truffleruby.language.ImmutableRubyString;
+import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.RubyContextNode;
 
 import com.oracle.truffle.api.dsl.Fallback;

src/main/java/org/truffleruby/core/cast/ToPathNode.java

@@ -10,7 +10,7 @@
 package org.truffleruby.core.cast;
 
 import org.truffleruby.core.string.RubyString;
-import org.truffleruby.language.ImmutableRubyString;
+import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.dispatch.DispatchNode;

src/main/java/org/truffleruby/core/cast/ToSNode.java

@@ -12,7 +12,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import org.truffleruby.core.kernel.KernelNodes;
 import org.truffleruby.core.string.RubyString;
-import org.truffleruby.language.ImmutableRubyString;
+import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.dispatch.DispatchNode;