Make PyObject_GenericGetDict work on managed objects

Author: msimacek

graalpython/com.oracle.graal.python.cext/src/dictobject.c

@@ -5528,6 +5528,10 @@ _PyObject_FreeInstanceAttributes(PyObject *self)
 PyObject *
 PyObject_GenericGetDict(PyObject *obj, void *context)
 {
+    // GraalPy change: upcall for managed
+    if (points_to_py_handle_space(obj)) {
+        return GraalPyTruffleObject_GenericGetDict(obj);
+    }
     PyObject *dict;
     // GraalPy change: we don't have inlined values in managed dict
     PyObject **dictptr = _PyObject_GetDictPtr(obj);

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py

@@ -1595,6 +1595,26 @@ def __hash__(self):
         cmpfunc=unhandled_error_compare
     )
 
+    object_with_attributes = MyObject()
+    object_with_attributes.foo = 1
+
+    test_PyObject_GenericGetDict = CPyExtFunction(
+        lambda args: args[0].__dict__,
+        lambda: (
+            (TestObjectFunctions.object_with_attributes,),
+        ),
+        code='''
+        static PyObject* wrap_PyObject_GenericGetDict(PyObject* obj) {
+            return PyObject_GenericGetDict(obj, NULL);
+        }
+        ''',
+        arguments=["PyObject* obj"],
+        resultspec="O",
+        argspec="O",
+        callfunction="wrap_PyObject_GenericGetDict",
+        cmpfunc=unhandled_error_compare
+    )
+
 
 class TestPickleNative:
     def test_pickle_native(self):

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

@@ -126,6 +126,7 @@
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
@@ -739,4 +740,14 @@ static Object dir(Object object,
             return dir.execute(null, inliningTarget, object);
         }
     }
+
+    @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Ignored)
+    abstract static class PyTruffleObject_GenericGetDict extends CApiUnaryBuiltinNode {
+        @Specialization
+        static Object getDict(Object object,
+                        @Bind("this") Node inliningTarget,
+                        @Cached GetOrCreateDictNode getDict) {
+            return getDict.execute(inliningTarget, object);
+        }
+    }
 }