From 567456fcc1aa81b03f424719f0f39045d8cb20f3 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 2 Sep 2026 13:16:52 +0200 Subject: [PATCH] Remove is_builtin_type --- graalpython/com.oracle.graal.python.cext/src/capi.c | 12 ------------ graalpython/com.oracle.graal.python.cext/src/capi.h | 2 -- .../com.oracle.graal.python.cext/src/typeobject.c | 2 -- 3 files changed, 16 deletions(-) diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c index 90a636123a..b340263c84 100644 --- a/graalpython/com.oracle.graal.python.cext/src/capi.c +++ b/graalpython/com.oracle.graal.python.cext/src/capi.c @@ -418,18 +418,6 @@ static void initialize_gc_types_related_slots() { _PyWeakref_RefType.tp_free = &GraalPyPrivate_Object_GC_Del; } -int is_builtin_type(PyTypeObject *tp) { -#define PY_TRUFFLE_TYPE_GENERIC(GLOBAL_NAME, __TYPE_NAME__, a, b, c, d, e, f, g) (tp == &GLOBAL_NAME) || -#define PY_TRUFFLE_TYPE_LOCAL(GLOBAL_NAME, __TYPE_NAME__, a, b) (tp == &GLOBAL_NAME) || -#define PY_TRUFFLE_TYPE_EXTERN(GLOBAL_NAME, __TYPE_NAME__) PY_TRUFFLE_TYPE_GENERIC(GLOBAL_NAME, __TYPE_NAME__, 0, 0, 0, 0, 0, 0, 0) -#define PY_TRUFFLE_TYPE_UNIMPLEMENTED(GLOBAL_NAME) // empty - return PY_TYPE_OBJECTS 0; -#undef PY_TRUFFLE_TYPE_GENERIC -#undef PY_TRUFFLE_TYPE_LOCAL -#undef PY_TRUFFLE_TYPE_EXTERN -#undef PY_TRUFFLE_TYPE_UNIMPLEMENTED -} - /** to be used from Java code only; calls '_Py_Dealloc' */ GraalPy_CAPI_HELPER_SYMBOL Py_ssize_t GraalPyPrivate_BulkDealloc(intptr_t ptrArray[], int64_t len) diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.h b/graalpython/com.oracle.graal.python.cext/src/capi.h index 3fcfa909e6..74e25b12cf 100644 --- a/graalpython/com.oracle.graal.python.cext/src/capi.h +++ b/graalpython/com.oracle.graal.python.cext/src/capi.h @@ -285,8 +285,6 @@ GraalPyPrivate_Log(int level, const char *format, ...) } } -Py_LOCAL_SYMBOL int is_builtin_type(PyTypeObject *tp); - // export the SizeT arg parse functions, because we use them in contrast to cpython on windows for core modules that we link dynamically PyAPI_FUNC(int) _PyArg_Parse_SizeT(PyObject *, const char *, ...); PyAPI_FUNC(int) _PyArg_ParseTuple_SizeT(PyObject *, const char *, ...); diff --git a/graalpython/com.oracle.graal.python.cext/src/typeobject.c b/graalpython/com.oracle.graal.python.cext/src/typeobject.c index 26702555e2..5013059fe7 100644 --- a/graalpython/com.oracle.graal.python.cext/src/typeobject.c +++ b/graalpython/com.oracle.graal.python.cext/src/typeobject.c @@ -2546,8 +2546,6 @@ is_subtype_with_mro(PyObject *a_mro, PyTypeObject *a, PyTypeObject *b) return PyType_FastSubclass(a, Py_TPFLAGS_DICT_SUBCLASS); } else if ((PyObject *)b == PyExc_BaseException) { return PyType_FastSubclass(a, Py_TPFLAGS_BASE_EXC_SUBCLASS); - } else if (is_builtin_type(a) && !is_builtin_type(b)) { - return 0; } int res; if (a_mro != NULL) {