Introduce __Pyx_PyLong_Check and use it in TypeConversion.c

fangerer · Apr 20, 2022 · 8ce1877 · 8ce1877
1 parent 99a0093
commit 8ce1877
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/Cython/Utility/ModuleSetupCode.c b/Cython/Utility/ModuleSetupCode.c
@@ -677,6 +677,8 @@ static CYTHON_INLINE int _HPy_IsSubclass(HPyContext *ctx, HPy derived, HPy cls)
 #define __Pyx_PyExc_RuntimeError PyExc_RuntimeError
 #define __Pyx_PyErr_WriteUnraisable PyErr_WriteUnraisable
 
+#define __Pyx_PyLong_Check PyLong_Check
+
 #define __Pyx_PyModule_GetDict PyModule_GetDict
 #define __Pyx_PyImport_AddModule PyImport_AddModule
 #define __Pyx_PyImport_GetModuleDict PyImport_GetModuleDict
@@ -725,6 +727,7 @@ static CYTHON_INLINE int _HPy_IsSubclass(HPyContext *ctx, HPy derived, HPy cls)
 
 #define HPyLong_Check(ctx, x) HPy_TypeCheck(ctx, x, ctx->h_LongType)
 #define HPyLong_CheckExact(ctx, x) HPy_Is(ctx, HPy_Type(ctx, x), ctx->h_LongType)
+#define __Pyx_PyLong_Check(ctx, x) HPy_TypeCheck(ctx, x, ctx->h_LongType)
 #define HPyBytes_CheckExact HPyBytes_Check
 #define HPyUnicode_Check(ctx, x) HPy_TypeCheck(ctx, x, ctx->h_UnicodeType)
 #define HPyUnicode_CheckExact(ctx, x) HPy_Is(ctx, HPy_Type(ctx, x), ctx->h_UnicodeType)

diff --git a/Cython/Utility/TypeConversion.c b/Cython/Utility/TypeConversion.c
@@ -1067,11 +1067,7 @@ static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(HPyContext *, HPy);
 
 {{py: from Cython.Utility import pylong_join }}
 
-#if !CYTHON_COMPILING_IN_HPY
-static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(PyObject *x) {
-#else /* CYTHON_COMPILING_IN_HPY */
-static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(HPyContext *$hpy_context_cname, HPy x) {
-#endif /* CYTHON_COMPILING_IN_HPY */
+static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(__PYX_CONTEXT_DECL __PYX_OBJECT_CTYPE x) {
 #ifdef __Pyx_HAS_GCC_DIAGNOSTIC
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wconversion"
@@ -1094,11 +1090,7 @@ static CYTHON_INLINE {{TYPE}} {{FROM_PY_FUNCTION}}(HPyContext *$hpy_context_cnam
         }
     } else
 #endif
-#if CYTHON_COMPILING_IN_HPY
-    if (likely(HPyLong_Check($hpy_context_cname, x))) {
-#else
-    if (likely(PyLong_Check(x))) {
-#endif
+    if (likely(__PYX_API_CALL(__Pyx_PyLong_Check, x))) {
         if (is_unsigned) {
 #if CYTHON_USE_PYLONG_INTERNALS
             const digit* digits = ((PyLongObject*)x)->ob_digit;