[GR-44445] Introduce weak cache for promoted TruffleStrings.

PullRequest: graalpython/2660

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

@@ -216,7 +216,7 @@ public abstract static class PromoteBorrowedValue extends Node {
         public abstract Object execute(Object value);
 
         @Specialization
-        static PythonBuiltinObject doString(TruffleString str,
+        public static PString doString(TruffleString str,
                         @Cached PythonObjectFactory factory) {
             return factory.createString(str);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java

@@ -67,6 +67,7 @@
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltinRegistry;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBuiltinExecutable;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.PromoteBorrowedValue;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
@@ -88,6 +89,7 @@
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
+import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.thread.PLock;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.IndirectCallNode;
@@ -101,6 +103,7 @@
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.util.PythonUtils;
+import com.oracle.graal.python.util.WeakIdentityHashMap;
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -160,6 +163,8 @@ public final class CApiContext extends CExtContext {
      */
     @CompilationFinal(dimensions = 1) private final PrimitiveNativeWrapper[] primitiveNativeWrapperCache;
 
+    private final WeakIdentityHashMap<TruffleString, PString> promotedTruffleStringCache;
+
     /**
      * Required to emulate PyLongObject's ABI; number of bits per digit (equal to
      * {@code PYLONG_BITS_IN_DIGIT}.
@@ -205,6 +210,7 @@ public static TruffleLogger getLogger(Class<?> clazz) {
     private CApiContext() {
         super(null, null, null);
         primitiveNativeWrapperCache = null;
+        promotedTruffleStringCache = null;
         llvmTypeCache = null;
     }
 
@@ -221,6 +227,7 @@ public CApiContext(PythonContext context, Object hpyLibrary) {
             CApiTransitions.incRef(nativeWrapper, PythonNativeWrapper.IMMORTAL_REFCNT);
             primitiveNativeWrapperCache[i] = nativeWrapper;
         }
+        promotedTruffleStringCache = new WeakIdentityHashMap<>();
     }
 
     public int getPyLongBitsInDigit() {
@@ -347,6 +354,16 @@ public Object getModuleByIndex(int i) {
         return null;
     }
 
+    @TruffleBoundary
+    public Object getOrInsertPromotedTruffleString(TruffleString obj) {
+        PString pString = promotedTruffleStringCache.get(obj);
+        if (pString == null) {
+            pString = PromoteBorrowedValue.doString(obj, getContext().factory());
+            promotedTruffleStringCache.put(obj, pString);
+        }
+        return pString;
+    }
+
     @TruffleBoundary
     public AllocInfo traceFree(Object ptr, @SuppressWarnings("unused") PFrame.Reference curFrame, @SuppressWarnings("unused") TruffleString clazzName) {
         if (allocatedNativeMemory == null) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/transitions/CApiTransitions.java

@@ -568,7 +568,13 @@ public static Object pythonToNative(Object obj, boolean transfer) {
         } else if (obj instanceof DescriptorDeleteMarker) {
             return PythonContext.get(null).getNativeNull().getPtr();
         } else {
-            PythonNativeWrapper wrapper = GetNativeWrapperNodeGen.getUncached().execute(obj);
+            Object promoted;
+            if (obj instanceof TruffleString) {
+                promoted = PythonContext.get(null).getCApiContext().getOrInsertPromotedTruffleString((TruffleString) obj);
+            } else {
+                promoted = obj;
+            }
+            PythonNativeWrapper wrapper = GetNativeWrapperNodeGen.getUncached().execute(promoted);
             if (transfer) {
                 // native part needs to decRef to release
                 incRef(wrapper, 1);