Copy tp_descr_get and tp_descr_set slots

Author: msimacek

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

@@ -137,6 +137,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___FLOORDIV__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___GETATTRIBUTE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___GETITEM__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.T___GET__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___HASH__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___IADD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___IAND__;
@@ -169,6 +170,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___RSHIFT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___SETATTR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___SETITEM__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.T___SET__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___STR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___SUB__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___TRUEDIV__;
@@ -1566,6 +1568,22 @@ public Object get(@SuppressWarnings("unused") PythonManagedClass object) {
         }
     }
 
+    @CApiBuiltin(ret = descrgetfunc, args = {PyTypeObject}, call = Ignored)
+    public abstract static class Py_get_PyTypeObject_tp_descr_get extends PyGetTypeSlotNode {
+
+        Py_get_PyTypeObject_tp_descr_get() {
+            super(T___GET__);
+        }
+    }
+
+    @CApiBuiltin(ret = descrsetfunc, args = {PyTypeObject}, call = Ignored)
+    public abstract static class Py_get_PyTypeObject_tp_descr_set extends PyGetTypeSlotNode {
+
+        Py_get_PyTypeObject_tp_descr_set() {
+            super(T___SET__);
+        }
+    }
+
     @CApiBuiltin(name = "Py_get_PyTypeObject_tp_traverse", ret = traverseproc, args = {PyTypeObject}, call = Ignored)
     @CApiBuiltin(name = "Py_get_PyTypeObject_tp_clear", ret = inquiry, args = {PyTypeObject}, call = Ignored)
     public abstract static class Py_get_PyTypeObject_tp_TraverseClear extends CApiUnaryBuiltinNode {
@@ -1927,8 +1945,6 @@ Object doTpBases(PythonManagedClass type,
     @CApiBuiltin(name = "Py_get_PyTypeObject_tp_methods", ret = PyMethodDef, args = {PyTypeObject}, call = Ignored)
     @CApiBuiltin(name = "Py_get_PyTypeObject_tp_members", ret = PyMemberDef, args = {PyTypeObject}, call = Ignored)
     @CApiBuiltin(name = "Py_get_PyTypeObject_tp_getset", ret = PyGetSetDef, args = {PyTypeObject}, call = Ignored)
-    @CApiBuiltin(name = "Py_get_PyTypeObject_tp_descr_get", ret = descrgetfunc, args = {PyTypeObject}, call = Ignored)
-    @CApiBuiltin(name = "Py_get_PyTypeObject_tp_descr_set", ret = descrsetfunc, args = {PyTypeObject}, call = Ignored)
     @CApiBuiltin(name = "Py_get_PyTypeObject_tp_is_gc", ret = inquiry, args = {PyTypeObject}, call = Ignored)
     @CApiBuiltin(name = "Py_get_PyTypeObject_tp_finalize", ret = destructor, args = {PyTypeObject}, call = Ignored)
     @CApiBuiltin(name = "Py_get_PyTypeObject_tp_vectorcall", ret = vectorcallfunc, args = {PyTypeObject}, call = Ignored)
@@ -2029,9 +2045,12 @@ private Object createProcsWrapper(Object value) {
                     return new PyProcsWrapper.RichcmpFunctionWrapper(value);
                 case objobjargproc:
                 case setattrofunc:
+                case descrsetfunc:
                     return new PyProcsWrapper.SetAttrWrapper(value);
                 case getattrofunc:
                     return new PyProcsWrapper.GetAttrWrapper(value);
+                case descrgetfunc:
+                    return new PyProcsWrapper.DescrGetFunctionWrapper(value);
             }
             throw CompilerDirectives.shouldNotReachHere("descriptor: " + getRetDescriptor());
         }

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

@@ -753,6 +753,59 @@ protected String getSignature() {
         }
     }
 
+    @ExportLibrary(InteropLibrary.class)
+    public static final class DescrGetFunctionWrapper extends PyProcsWrapper {
+
+        public DescrGetFunctionWrapper(Object delegate) {
+            super(delegate);
+        }
+
+        @ExportMessage(name = "execute")
+        static class Execute {
+
+            @Specialization(guards = "arguments.length == 3")
+            static Object call(DescrGetFunctionWrapper self, Object[] arguments,
+                            @Cached CallTernaryMethodNode callNode,
+                            @Cached ToJavaNode toJavaNode,
+                            @Cached ToNewRefNode toNewRefNode,
+                            @Cached TransformExceptionToNativeNode transformExceptionToNativeNode,
+                            @Exclusive @Cached GilNode gil) {
+                boolean mustRelease = gil.acquire();
+                CApiTiming.enter();
+                try {
+                    try {
+                        // convert args
+                        Object receiver = toJavaNode.execute(arguments[0]);
+                        Object obj = toJavaNode.execute(arguments[1]);
+                        Object cls = toJavaNode.execute(arguments[2]);
+
+                        Object result = callNode.execute(null, self.getDelegate(), receiver, obj, cls);
+                        return toNewRefNode.execute(result);
+                    } catch (Throwable t) {
+                        throw checkThrowableBeforeNative(t, "DescrGetFunctionWrapper", self.getDelegate());
+                    }
+                } catch (PException e) {
+                    transformExceptionToNativeNode.execute(null, e);
+                    return PythonContext.get(gil).getNativeNull().getPtr();
+                } finally {
+                    CApiTiming.exit(self.timing);
+                    gil.release(mustRelease);
+                }
+            }
+
+            @Specialization(guards = "arguments.length != 3")
+            static Object error(@SuppressWarnings("unused") DescrGetFunctionWrapper self, Object[] arguments) throws ArityException {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                throw ArityException.create(3, 3, arguments.length);
+            }
+        }
+
+        @Override
+        protected String getSignature() {
+            return "(POINTER,POINTER,POINTER):POINTER";
+        }
+    }
+
     public static GetAttrWrapper createGetAttrWrapper(Object method) {
         assert !(method instanceof PNone) && !(method instanceof PNotImplemented);
         return new GetAttrWrapper(method);