Perform lazy initialization of c recursion check

markshannon · markshannon · commit dbcf6f02685e · 2025-02-12T12:19:13.000Z
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
@@ -222,11 +222,19 @@ static inline void _Py_LeaveRecursiveCallTstate(PyThreadState *tstate) {
     (void)tstate;
 }
 
+PyAPI_FUNC(void) _Py_InitializeRecursionCheck(PyThreadState *tstate);
+
 static inline int _Py_ReachedRecursionLimit(PyThreadState *tstate, int margin_count)  {
     assert(tstate->c_stack_soft_limit != UINTPTR_MAX);
     char here;
     uintptr_t here_addr = (uintptr_t)&here;
-    return here_addr <= tstate->c_stack_soft_limit + margin_count * PYOS_STACK_MARGIN_BYTES;
+    if (here_addr > tstate->c_stack_soft_limit + margin_count * PYOS_STACK_MARGIN_BYTES) {
+        return 0;
+    }
+    if (tstate->c_stack_hard_limit == 0) {
+        _Py_InitializeRecursionCheck(tstate);
+    }
+    return here_addr <= stack_soft_limit + margin_count * PYOS_STACK_MARGIN_BYTES;
 }
 
 static inline void _Py_LeaveRecursiveCall(void)  {
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -318,6 +318,35 @@ _Py_EnterRecursiveCallUnchecked(PyThreadState *tstate)
     }
 }
 
+void
+_Py_InitializeRecursionCheck(PyThreadState *tstate)
+{
+    char here;
+    uintptr_t here_addr = (uintptr_t)&here;
+#ifdef USE_STACKCHECK
+    if (_PyOS_CheckStack(PYOS_STACK_MARGIN * 2) == 0) {
+        tstate->c_stack_soft_limit = here_addr - PYOS_STACK_MARGIN_BYTES;
+        return 0;
+    }
+    int margin = PYOS_STACK_MARGIN;
+    assert(tstate->c_stack_soft_limit != UINTPTR_MAX);
+    if (_PyOS_CheckStack(margin)) {
+        margin = PYOS_STACK_MARGIN/2;
+    }
+    else {
+        if (_PyOS_CheckStack(PYOS_STACK_MARGIN*3/2) == 0) {
+            margin = PYOS_STACK_MARGIN*3/2;
+        }
+    }
+    tstate->c_stack_hard_limit = here_addr - margin * sizeof(void *);
+    tstate->c_stack_soft_limit = tstate->c_stack_hard_limit + PYOS_STACK_MARGIN_BYTES;
+#else
+    assert(tstate->c_stack_soft_limit == UINTPTR_MAX);
+    tstate->c_stack_soft_limit = here_addr - Py_C_STACK_SIZE;
+    tstate->c_stack_hard_limit = here_addr - (Py_C_STACK_SIZE + PYOS_STACK_MARGIN_BYTES);
+#endif
+}
+
 /* The function _Py_EnterRecursiveCallTstate() only calls _Py_CheckRecursiveCall()
    if the recursion_depth reaches recursion_limit. */
 int
@@ -327,28 +356,7 @@ _Py_CheckRecursiveCall(PyThreadState *tstate, const char *where)
     uintptr_t here_addr = (uintptr_t)&here;
     assert(tstate->c_stack_soft_limit != 0);
     if (tstate->c_stack_hard_limit == 0) {
-#ifdef USE_STACKCHECK
-        if (_PyOS_CheckStack(PYOS_STACK_MARGIN * 2) == 0) {
-            tstate->c_stack_soft_limit = here_addr - PYOS_STACK_MARGIN_BYTES;
-            return 0;
-        }
-        int margin = PYOS_STACK_MARGIN;
-        assert(tstate->c_stack_soft_limit != UINTPTR_MAX);
-        if (_PyOS_CheckStack(margin)) {
-            margin = PYOS_STACK_MARGIN/2;
-        }
-        else {
-            if (_PyOS_CheckStack(PYOS_STACK_MARGIN*3/2) == 0) {
-                margin = PYOS_STACK_MARGIN*3/2;
-            }
-        }
-        tstate->c_stack_hard_limit = here_addr - margin * sizeof(void *);
-        tstate->c_stack_soft_limit = tstate->c_stack_hard_limit + PYOS_STACK_MARGIN_BYTES;
-#else
-        assert(tstate->c_stack_soft_limit == UINTPTR_MAX);
-        tstate->c_stack_soft_limit = here_addr - Py_C_STACK_SIZE;
-        tstate->c_stack_hard_limit = here_addr - (Py_C_STACK_SIZE + PYOS_STACK_MARGIN_BYTES);
-#endif
+        _Py_InitializeRecursionCheck(tstate);
     }
     if (here_addr >= tstate->c_stack_soft_limit) {
         return 0;
