Move to a shared cache for interned strings and frozen literals.

Author: aardvark179

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

@@ -120,7 +120,6 @@ public class RubyContext {
     private final PreInitializationManager preInitializationManager;
     private final NativeConfiguration nativeConfiguration;
     private final ValueWrapperManager valueWrapperManager = new ValueWrapperManager(this);
-    private final WeakValueCache<RopeKey, DynamicObject> internedStringCache = new WeakValueCache<>();
 
     private final CompilerOptions compilerOptions = Truffle.getRuntime().createCompilerOptions();
 
@@ -639,6 +638,10 @@ public DynamicObject getFrozenStringLiteral(Rope rope) {
         return frozenStringLiterals.getFrozenStringLiteral(rope);
     }
 
+    public DynamicObject getInternedString(DynamicObject string) {
+        return frozenStringLiterals.getFrozenStringLiteral(string);
+    }
+
     public Object getClassVariableDefinitionLock() {
         return classVariableDefinitionLock;
     }
@@ -784,10 +787,6 @@ public ValueWrapperManager getValueWrapperManager() {
         return valueWrapperManager;
     }
 
-    public WeakValueCache<RopeKey, DynamicObject> getInternedStringCache() {
-        return internedStringCache;
-    }
-
     private static SecureRandom createRandomInstance() {
         try {
             /*

src/main/java/org/truffleruby/collections/WeakValueCache.java

@@ -38,6 +38,8 @@
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+
 import org.truffleruby.core.hash.ReHashable;
 
 /**
@@ -65,6 +67,7 @@ public Value get(Key key) {
      * Returns the value in the cache (existing or added).
      * Similar to a putIfAbsent() but always return the value in the cache.
      */
+    @TruffleBoundary
     public Value addInCacheIfAbsent(Key key, Value newValue) {
         removeStaleEntries();
 

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

@@ -12,23 +12,33 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.truffleruby.Layouts;
 import org.truffleruby.RubyContext;
 import org.truffleruby.collections.ConcurrentOperations;
+import org.truffleruby.collections.WeakValueCache;
 import org.truffleruby.core.rope.Rope;
+import org.truffleruby.core.rope.RopeKey;
 
 import com.oracle.truffle.api.object.DynamicObject;
 
 public class FrozenStringLiterals {
 
     private final RubyContext context;
-    private final Map<Rope, DynamicObject> strings = new ConcurrentHashMap<>();
+    private final WeakValueCache<RopeKey, DynamicObject> values = new WeakValueCache<>();
 
     public FrozenStringLiterals(RubyContext context) {
         this.context = context;
     }
 
     public DynamicObject getFrozenStringLiteral(Rope rope) {
-        return ConcurrentOperations.getOrCompute(strings, rope, r -> StringOperations.createFrozenString(context, rope));
+        final RopeKey key = new RopeKey(rope, context.getHashing(values));
+        return values.addInCacheIfAbsent(key, StringOperations.createFrozenString(context, rope));
+    }
+
+    public DynamicObject getFrozenStringLiteral(DynamicObject string) {
+        final Rope rope = Layouts.STRING.getRope(string);
+        final RopeKey key = new RopeKey(rope, context.getHashing(values));
+        return values.addInCacheIfAbsent(key, string);
     }
 
 }

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

@@ -128,6 +128,7 @@
 import org.truffleruby.core.rope.RopeKey;
 import org.truffleruby.core.rope.RopeNodes;
 import org.truffleruby.core.rope.RopeNodes.RepeatNode;
+import org.truffleruby.core.rope.TruffleRopesNodes.FlattenRopeNode;
 import org.truffleruby.core.rope.RopeOperations;
 import org.truffleruby.core.rope.SubstringRope;
 import org.truffleruby.core.string.StringNodesFactory.ByteIndexFromCharIndexNodeGen;
@@ -4717,8 +4718,8 @@ protected Object emptyString(DynamicObject string) {
     public abstract static class InternNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization
-        public DynamicObject internString(DynamicObject string) {
-            return getContext().getInternedStringCache().addInCacheIfAbsent(new RopeKey(Layouts.STRING.getRope(string), getContext().getHashing(this)), string);
+        public DynamicObject internString(VirtualFrame frame, DynamicObject string) {
+            return getContext().getInternedString(string);
         }
     }