[GR-61997] calculate metaclass during native type initialization

Author: qunaibit

graalpython/com.oracle.graal.python.cext/CAPIFunctions.txt

@@ -962,6 +962,7 @@ _PyEval_SetSwitchInterval;void;unsigned long
 _PyEval_SetTrace;int;PyThreadState*|Py_tracefunc|PyObject*
 _PyEval_SliceIndex;int;PyObject*|Py_ssize_t*
 _PyEval_SliceIndexNotNone;int;PyObject*|Py_ssize_t*
+PyUnstable_Eval_RequestCodeExtraIndex;Py_ssize_t;freefunc
 _PyFrame_IsEntryFrame;int;PyFrameObject*
 _PyFunction_Vectorcall;PyObject*;PyObject*|PyObject*const*|size_t|PyObject*
 _PyGILState_GetInterpreterStateUnsafe;PyInterpreterState*;void

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

@@ -3117,7 +3117,6 @@ PyType_GetFlags(PyTypeObject *type)
 }
 
 
-#if 0 // GraalPy change
 int
 PyType_SUPPORTS_WEAKREFS(PyTypeObject *type)
 {
@@ -3161,6 +3160,7 @@ _PyType_CalculateMetaclass(PyTypeObject *metatype, PyObject *bases)
     return winner;
 }
 
+#if 0 // GraalPy change
 
 // Forward declaration
 static PyObject *
@@ -4279,7 +4279,7 @@ _PyType_FromMetaclass_impl(
         goto finally;
     }
 
-#if 0 // GraalPy change [GR-61997]
+#if 0 // GraalPy change
     /* If this is an immutable type, check if all bases are also immutable,
      * and (for now) fire a deprecation warning if not.
      * (This isn't necessary for static types: those can't have heap bases,
@@ -4305,6 +4305,7 @@ _PyType_FromMetaclass_impl(
             }
         }
     }
+#endif // GraalPy change
 
     /* Calculate the metaclass */
 
@@ -4338,9 +4339,6 @@ _PyType_FromMetaclass_impl(
             goto finally;
         }
     }
-#else // GraalPy change
-        metaclass = &PyType_Type;
-#endif // GraalPy change
 
     /* Calculate best base, and check that all bases are type objects */
     PyTypeObject *base = best_base(bases);  // borrowed ref

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

@@ -166,6 +166,7 @@
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor._PyFrameEvalFunction;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor._PyInterpreterFrame;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.destructor;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.freefunc;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.func_intvoidptr;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.func_objcharsizevoidptr;
 import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.func_objint;
@@ -760,6 +761,7 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyEval_ReleaseThread", ret = Void, args = {PyThreadState}, call = NotImplemented)
     @CApiBuiltin(name = "PyEval_SetProfile", ret = Void, args = {PY_TRACEFUNC, PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "PyEval_SetTrace", ret = Void, args = {PY_TRACEFUNC, PyObject}, call = NotImplemented)
+    @CApiBuiltin(name = "PyUnstable_Eval_RequestCodeExtraIndex", ret = Py_ssize_t, args = {freefunc}, call = NotImplemented)
     @CApiBuiltin(name = "PyExceptionClass_Name", ret = ConstCharPtrAsTruffleString, args = {PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "PyFile_FromFd", ret = PyObject, args = {Int, ConstCharPtrAsTruffleString, ConstCharPtrAsTruffleString, Int, ConstCharPtrAsTruffleString, ConstCharPtrAsTruffleString,
                     ConstCharPtrAsTruffleString, Int}, call = NotImplemented)
@@ -916,7 +918,7 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyTruffleFrame_New", ret = PyFrameObjectTransfer, args = {PyThreadState, PyCodeObject, PyObject, PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "PyTruffle_SeqIter_New", ret = PyObjectTransfer, args = {PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "PyType_ClearCache", ret = UNSIGNED_INT, args = {}, call = NotImplemented)
-    @CApiBuiltin(name = "PyType_SUPPORTS_WEAKREFS", ret = Int, args = {PyTypeObject}, call = NotImplemented)
+    @CApiBuiltin(name = "PyType_SUPPORTS_WEAKREFS", ret = Int, args = {PyTypeObject}, call = CImpl)
     @CApiBuiltin(name = "PyUnicodeDecodeError_GetEncoding", ret = PyObject, args = {PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnicodeDecodeError_GetEnd", ret = Int, args = {PyObject, PY_SSIZE_T_PTR}, call = NotImplemented)
     @CApiBuiltin(name = "PyUnicodeDecodeError_GetObject", ret = PyObject, args = {PyObject}, call = NotImplemented)
@@ -1162,7 +1164,7 @@ public final class CApiFunction {
     @CApiBuiltin(name = "_PyTraceMalloc_GetTraceback", ret = PyObject, args = {UNSIGNED_INT, UINTPTR_T}, call = NotImplemented)
     @CApiBuiltin(name = "_PyTuple_DebugMallocStats", ret = Void, args = {FILE_PTR}, call = NotImplemented)
     @CApiBuiltin(name = "_PyTuple_Resize", ret = Int, args = {PyObjectPtr, Py_ssize_t}, call = NotImplemented)
-    @CApiBuiltin(name = "_PyType_CalculateMetaclass", ret = PyTypeObject, args = {PyTypeObject, PyObject}, call = NotImplemented)
+    @CApiBuiltin(name = "_PyType_CalculateMetaclass", ret = PyTypeObject, args = {PyTypeObject, PyObject}, call = CImpl)
     @CApiBuiltin(name = "_PyType_GetDocFromInternalDoc", ret = PyObject, args = {ConstCharPtrAsTruffleString, ConstCharPtrAsTruffleString}, call = NotImplemented)
     @CApiBuiltin(name = "_PyType_GetTextSignatureFromInternalDoc", ret = PyObject, args = {ConstCharPtrAsTruffleString, ConstCharPtrAsTruffleString}, call = NotImplemented)
     @CApiBuiltin(name = "_PyType_LookupId", ret = PyObject, args = {PyTypeObject, PY_IDENTIFIER}, call = NotImplemented)