Set tp_free for managed objects to PyObject_GC_Del

Author: msimacek

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

@@ -43,7 +43,9 @@
 import static com.oracle.graal.python.builtins.objects.PNone.NO_VALUE;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PTR_ADD;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PTR_COMPARE;
+import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PY_OBJECT_GC_DEL;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PY_TRUFFLE_MEMORYVIEW_FROM_OBJECT;
+import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PY_TYPE_GENERIC_ALLOC;
 import static com.oracle.graal.python.builtins.objects.cext.structs.CConstants.PYLONG_BITS_IN_DIGIT;
 import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyFloatObject__ob_fval;
 import static com.oracle.graal.python.builtins.objects.cext.structs.CFields.PyMethodDef__ml_doc;
@@ -872,16 +874,19 @@ public static PCallCapiFunction getUncached() {
      */
     @TruffleBoundary
     public static Object lookupNativeMemberInMRO(PythonManagedClass cls, @SuppressWarnings("unused") CFields nativeMemberName, HiddenAttr managedMemberName) {
-        if (cls instanceof PythonClass && (managedMemberName == HiddenAttr.ALLOC || managedMemberName == HiddenAttr.DEL)) {
+        if (cls instanceof PythonClass && (managedMemberName == HiddenAttr.ALLOC || managedMemberName == HiddenAttr.FREE)) {
             Object func = HiddenAttr.ReadNode.executeUncached(cls, managedMemberName, null);
             if (func != null) {
                 return func;
             }
-            PythonObject object = PythonContext.get(null).lookupType(PythonBuiltinClassType.PythonObject);
             // We need to point to PyType_GenericAlloc or PyObject_GC_Del
-            func = HiddenAttr.ReadNode.executeUncached(object, managedMemberName, NO_VALUE);
-            HiddenAttr.WriteNode.executeUncached(cls, managedMemberName, func);
-            return func;
+            NativeCAPISymbol symbol;
+            if (managedMemberName == HiddenAttr.ALLOC) {
+                symbol = FUN_PY_TYPE_GENERIC_ALLOC;
+            } else {
+                symbol = FUN_PY_OBJECT_GC_DEL;
+            }
+            return CApiContext.getNativeSymbol(null, symbol);
         }
         MroSequenceStorage mroStorage = GetMroStorageNode.executeUncached(cls);
         int n = mroStorage.length();

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

@@ -129,6 +129,8 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_PY_OBJECT_GENERIC_SET_DICT("PyObject_GenericSetDict", Int, PyObject, PyObject, Pointer),
     FUN_PY_OBJECT_NEW("PyTruffle_Object_New", PyObject, PyTypeObject),
     FUN_PY_TYPE_READY("PyType_Ready", Int, PyTypeObject),
+    FUN_PY_TYPE_GENERIC_ALLOC("PyType_GenericAlloc", PyObject, PyTypeObject, Py_ssize_t),
+    FUN_PY_OBJECT_GC_DEL("PyObject_GC_Del", Void, Pointer),
     FUN_GET_BUFFER_R("get_buffer_r", Int, PyObject, Pointer),
     FUN_GET_BUFFER_RW("get_buffer_rw", Int, PyObject, Pointer),
     FUN_CONVERTBUFFER("convertbuffer", Py_ssize_t, PyObject, Pointer),