[GR-15990] Make frozen strings context independent

PullRequest: truffleruby/2134

Author: eregon

src/main/.checkstyle_checks.xml

@@ -214,6 +214,10 @@
       <property name="format" value='"isNil'/>
       <property name="message" value="Type the argument as Nil instead of using a positive isNil() guard."/>
     </module>
+    <module name="RegexpSinglelineJava">
+      <property name="format" value='@CachedLibrary\(".+RubyStringLibrary'/>
+      <property name="message" value="Use @CachedLibrary(limit = &quot;2&quot;) RubyStringLibrary instead."/>
+    </module>
     <module name="IllegalType">
       <!-- Use PrintStream instead of PrintWriter, PrintWriter does not consistently flush, even when writing \n.-->
       <property name="illegalClassNames" value="TruffleObject,DynamicObject,PrintWriter"/>

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

@@ -51,17 +51,16 @@
 import org.truffleruby.core.proc.ProcOperations;
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.regexp.RegexpCacheKey;
+import org.truffleruby.core.rope.NativeRope;
 import org.truffleruby.core.rope.PathToRopeCache;
-import org.truffleruby.core.rope.Rope;
-import org.truffleruby.core.string.FrozenStringLiterals;
-import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.core.thread.ThreadManager;
 import org.truffleruby.core.time.GetTimeZoneNode;
 import org.truffleruby.debug.MetricsProfiler;
 import org.truffleruby.extra.ffi.Pointer;
 import org.truffleruby.interop.InteropManager;
 import org.truffleruby.language.CallStackManager;
+import org.truffleruby.language.ImmutableRubyString;
 import org.truffleruby.language.LexicalScope;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.SafepointManager;
@@ -117,7 +116,6 @@ public class RubyContext {
     private final SharedObjects sharedObjects = new SharedObjects(this);
     private final AtExitManager atExitManager = new AtExitManager(this);
     private final CallStackManager callStack = new CallStackManager(this);
-    private final FrozenStringLiterals frozenStringLiterals;
     private final CoreExceptions coreExceptions;
     private final EncodingManager encodingManager;
     private final MetricsProfiler metricsProfiler = new MetricsProfiler(this);
@@ -128,6 +126,7 @@ public class RubyContext {
     private final Map<Source, Integer> sourceLineOffsets = Collections.synchronizedMap(new WeakHashMap<>());
     /** (Symbol, refinements) -> Proc for Symbol#to_proc */
     public final Map<Pair<RubySymbol, Map<RubyModule, RubyModule[]>>, RootCallTarget> cachedSymbolToProcTargetsWithRefinements = new ConcurrentHashMap<>();
+    private final Map<ImmutableRubyString, NativeRope> immutableNativeRopes = new ConcurrentHashMap<>();
 
     @CompilationFinal private SecureRandom random;
     private final Hashing hashing;
@@ -173,7 +172,6 @@ public RubyContext(RubyLanguage language, TruffleLanguage.Env env) {
         options = createOptions(env, language.options);
 
         safepointManager = new SafepointManager(this, language);
-        frozenStringLiterals = new FrozenStringLiterals(this, language);
         coreExceptions = new CoreExceptions(this, language);
         encodingManager = new EncodingManager(this, language);
 
@@ -626,14 +624,6 @@ public CallStackManager getCallStack() {
         return callStack;
     }
 
-    public RubyString getFrozenStringLiteral(Rope rope) {
-        return frozenStringLiterals.getFrozenStringLiteral(rope);
-    }
-
-    public RubyString getInternedString(RubyString string) {
-        return frozenStringLiterals.getFrozenStringLiteral(string);
-    }
-
     public Object getClassVariableDefinitionLock() {
         return classVariableDefinitionLock;
     }
@@ -758,6 +748,10 @@ public Map<Source, Integer> getSourceLineOffsets() {
         return sourceLineOffsets;
     }
 
+    public Map<ImmutableRubyString, NativeRope> getImmutableNativeRopes() {
+        return immutableNativeRopes;
+    }
+
     private static SecureRandom createRandomInstance() {
         try {
             /* We want to use a non-blocking source because this is what MRI does (via /dev/urandom) and it's been found

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

@@ -50,9 +50,11 @@
 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.Rope;
 import org.truffleruby.core.rope.RopeCache;
 import org.truffleruby.core.string.CoreStrings;
+import org.truffleruby.core.string.FrozenStringLiterals;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.core.support.RubyByteArray;
@@ -67,6 +69,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.language.NotProvided;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyEvalInteractiveRootNode;
@@ -148,6 +151,7 @@ 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;
     @CompilationFinal public LanguageOptions options;
@@ -204,6 +208,7 @@ public RubyLanguage() {
         coreStrings = new CoreStrings(this);
         coreSymbols = new CoreSymbols();
         primitiveManager = new PrimitiveManager();
+        frozenStringLiterals = new FrozenStringLiterals();
         ropeCache = new RopeCache(coreSymbols);
         symbolTable = new SymbolTable(ropeCache, coreSymbols);
     }
@@ -420,6 +425,10 @@ public AllocationReporter getAllocationReporter() {
         return allocationReporter;
     }
 
+    public ImmutableRubyString getFrozenStringLiteral(LeafRope rope) {
+        return frozenStringLiterals.getFrozenStringLiteral(rope);
+    }
+
     public long getNextObjectID() {
         final long id = nextObjectID.getAndAdd(ObjectSpaceManager.OBJECT_ID_INCREMENT_BY);