Fix cache overlap for mp_subscript and sq_item

Author: msimacek

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

@@ -212,6 +212,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.PySequenceMethodsWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.UnicodeObjectNodes.UnicodeAsWideCharNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers.CStringWrapper;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.SizeofWCharNode;
@@ -2012,17 +2013,19 @@ private Object getProcsWrapper(Object type) {
              */
             if (value instanceof PBuiltinFunction function) {
                 Object wrappedPtr = ExternalFunctionNodes.tryGetHiddenCallable(function);
+                // TODO also check that the signature matches
                 if (wrappedPtr != null && name.equalsUncached(function.getName(), TS_ENCODING) &&
-                                function.getEnclosingType() != null && IsSubtypeNode.getUncached().execute(type, function.getEnclosingType())) {
+                                function.getEnclosingType() != null && IsSubtypeNode.getUncached().execute(type,
+                                                function.getEnclosingType())) {
                     return wrappedPtr;
                 }
             }
             CApiContext cApiContext = PythonContext.get(this).getCApiContext();
-            return cApiContext.getOrCreateProcWrapper(value, this::createProcsWrapper);
+            return cApiContext.getOrCreateProcWrapper(getRetDescriptor(), value, PyGetTypeSlotNode::createProcsWrapper);
         }
 
-        private Object createProcsWrapper(Object value) {
-            switch (getRetDescriptor()) {
+        private static Object createProcsWrapper(ArgDescriptor signature, Object value) {
+            switch (signature) {
                 case unaryfunc:
                 case reprfunc:
                 case iternextfunc:
@@ -2053,7 +2056,7 @@ private Object createProcsWrapper(Object value) {
                 case descrgetfunc:
                     return new PyProcsWrapper.DescrGetFunctionWrapper(value);
             }
-            throw CompilerDirectives.shouldNotReachHere("descriptor: " + getRetDescriptor());
+            throw CompilerDirectives.shouldNotReachHere("descriptor: " + signature);
         }
     }
 

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

@@ -55,6 +55,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
+import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -75,6 +76,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.ToJavaNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.ToNewRefNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PrimitiveNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.HandleTester;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions.JavaStringToTruffleString;
@@ -102,7 +104,7 @@
 import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
-import com.oracle.graal.python.util.Function;
+import com.oracle.graal.python.util.BiFunction;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.graal.python.util.WeakIdentityHashMap;
 import com.oracle.truffle.api.CallTarget;
@@ -201,8 +203,6 @@ public final class CApiContext extends CExtContext {
     private boolean loadNativeLibrary = true;
     public RootCallTarget signatureContainer;
 
-    private final WeakIdentityHashMap<Object, Object> procWrappers = new WeakIdentityHashMap<>();
-
     public static TruffleLogger getLogger(Class<?> clazz) {
         return PythonLanguage.getLogger(LOGGER_CAPI_NAME + "." + clazz.getSimpleName());
     }
@@ -1071,8 +1071,26 @@ public void retainClosure(Object closure) {
         callableClosures.add(closure);
     }
 
+    private record ProcCacheItem(ArgDescriptor signature, Object callable) {
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof ProcCacheItem other) {
+                return signature == other.signature && callable == other.callable;
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return System.identityHashCode(signature) + 31 * System.identityHashCode(callable);
+        }
+    }
+
+    private final Map<ProcCacheItem, Object> procWrappers = new WeakHashMap<>();
+
     @TruffleBoundary
-    public Object getOrCreateProcWrapper(Object callable, Function<Object, Object> factory) {
-        return procWrappers.computeIfAbsent(callable, factory);
+    public Object getOrCreateProcWrapper(ArgDescriptor signature, Object callable, BiFunction<ArgDescriptor, Object, Object> factory) {
+        return procWrappers.computeIfAbsent(new ProcCacheItem(signature, callable), (cacheItem) -> factory.apply(cacheItem.signature, cacheItem.callable));
     }
 }