Generalize creating native method wrappers

Author: msimacek

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

@@ -175,6 +175,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___SUB__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___TRUEDIV__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___XOR__;
+import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 
 import java.nio.charset.CharsetEncoder;
@@ -191,7 +192,7 @@
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject.PInteropGetAttributeNode;
 import com.oracle.graal.python.builtins.objects.bytes.PByteArray;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
-import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
+import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsCharPointerNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.LookupNativeMemberInMRONode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ObSizeNode;
@@ -230,7 +231,6 @@
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
-import com.oracle.graal.python.builtins.objects.function.PFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.getsetdescriptor.GetSetDescriptor;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
@@ -265,6 +265,7 @@
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToBuiltinTypeNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
+import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.InlineIsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectProfile;
 import com.oracle.graal.python.nodes.object.GetDictIfExistsNode;
@@ -1979,9 +1980,11 @@ public Object get(@SuppressWarnings("unused") Object object) {
     }
 
     public abstract static class PyGetTypeSlotNode extends CApiUnaryBuiltinNode {
+        private final TruffleString name;
         private @Child LookupAttributeInMRONode lookup;
 
         PyGetTypeSlotNode(TruffleString name) {
+            this.name = name;
             lookup = LookupAttributeInMRONode.create(name);
         }
 
@@ -1996,28 +1999,26 @@ public Object getClass(PythonManagedClass object) {
         }
 
         @TruffleBoundary
-        private Object getProcsWrapper(Object object) {
-            Object value = lookup.execute(object);
+        private Object getProcsWrapper(Object type) {
+            Object value = lookup.execute(type);
             if (value instanceof PNone) {
                 // both None and NO_VALUE can appear
                 return getNULL();
             }
-            if (value instanceof PFunction) {
-                PFunction func = (PFunction) value;
-                if (func.procsWrapper != null) {
-                    return func.procsWrapper;
+            /*
+             * The method can be a slot wrapper that already wraps a native slot function. If it
+             * matches in type and slot name, we should unwrap it to avoid nesting multiple
+             * wrappers.
+             */
+            if (value instanceof PBuiltinFunction function) {
+                Object wrappedPtr = ExternalFunctionNodes.tryGetHiddenCallable(function);
+                if (wrappedPtr != null && name.equalsUncached(function.getName(), TS_ENCODING) &&
+                                function.getEnclosingType() != null && IsSubtypeNode.getUncached().execute(type, function.getEnclosingType())) {
+                    return wrappedPtr;
                 }
-                return func.procsWrapper = createProcsWrapper(value);
-            } else if (value instanceof PBuiltinFunction) {
-                PBuiltinFunction func = (PBuiltinFunction) value;
-                if (func.procsWrapper != null) {
-                    return func.procsWrapper;
-                }
-                return func.procsWrapper = createProcsWrapper(value);
-            } else if (value instanceof PythonAbstractNativeObject) {
-                return ((PythonAbstractNativeObject) value).getPtr();
             }
-            throw CompilerDirectives.shouldNotReachHere(value.getClass().getSimpleName());
+            CApiContext cApiContext = PythonContext.get(this).getCApiContext();
+            return cApiContext.getOrCreateProcWrapper(value, this::createProcsWrapper);
         }
 
         private Object createProcsWrapper(Object value) {

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

@@ -53,6 +53,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -100,6 +101,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.PythonUtils;
 import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -195,6 +197,8 @@ public final class CApiContext extends CExtContext {
     private boolean loadNativeLibrary = true;
     public RootCallTarget signatureContainer;
 
+    private final IdentityHashMap<Object, Object> procWrappers = new IdentityHashMap<>();
+
     public static TruffleLogger getLogger(Class<?> clazz) {
         return PythonLanguage.getLogger(LOGGER_CAPI_NAME + "." + clazz.getSimpleName());
     }
@@ -1050,4 +1054,9 @@ public void setClosurePointer(Object callable, Object closure, long pointer) {
     public void retainClosure(Object closure) {
         callableClosures.add(closure);
     }
+
+    @TruffleBoundary
+    public Object getOrCreateProcWrapper(Object callable, Function<Object, Object> factory) {
+        return procWrappers.computeIfAbsent(callable, factory);
+    }
 }

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

@@ -168,6 +168,13 @@ public static PKeyword[] createKwDefaults(Object callable, Object closure) {
         return new PKeyword[]{new PKeyword(KW_CALLABLE, callable), new PKeyword(KW_CLOSURE, closure)};
     }
 
+    public static Object tryGetHiddenCallable(PBuiltinFunction function) {
+        if (function.getFunctionRootNode() instanceof MethodDescriptorRoot) {
+            return getHiddenCallable(function.getKwDefaults());
+        }
+        return null;
+    }
+
     public static Object getHiddenCallable(PKeyword[] kwDefaults) {
         if (kwDefaults.length >= KEYWORDS_HIDDEN_CALLABLE.length) {
             PKeyword kwDefault = kwDefaults[0];

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PBuiltinFunction.java

@@ -79,8 +79,6 @@ public final class PBuiltinFunction extends PythonBuiltinObject implements Bound
     @CompilationFinal(dimensions = 1) private final Object[] defaults;
     @CompilationFinal(dimensions = 1) private final PKeyword[] kwDefaults;
 
-    public Object procsWrapper;
-
     public PBuiltinFunction(PythonBuiltinClassType cls, Shape shape, TruffleString name, Object enclosingType, Object[] defaults, PKeyword[] kwDefaults, int flags, RootCallTarget callTarget) {
         super(cls, shape);
         this.name = PythonUtils.toPString(name);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PFunction.java

@@ -63,8 +63,6 @@ public final class PFunction extends PythonObject {
     @CompilationFinal(dimensions = 1) private Object[] defaultValues;
     @CompilationFinal(dimensions = 1) private PKeyword[] kwDefaultValues;
 
-    public Object procsWrapper;
-
     public PFunction(PythonLanguage lang, TruffleString name, TruffleString qualname, PCode code, PythonObject globals, PCell[] closure) {
         this(lang, name, qualname, code, globals, PythonUtils.EMPTY_OBJECT_ARRAY, PKeyword.EMPTY_KEYWORDS, closure);
     }