Skip to content

Commit 2cc3287

Browse files
committed
Post merge fixup
1 parent dbcf6f0 commit 2cc3287

File tree

2 files changed

+448
-1141
lines changed

2 files changed

+448
-1141
lines changed

Include/internal/pycore_ceval.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ static inline void _Py_LeaveRecursiveCallTstate(PyThreadState *tstate) {
225225
PyAPI_FUNC(void) _Py_InitializeRecursionCheck(PyThreadState *tstate);
226226

227227
static inline int _Py_ReachedRecursionLimit(PyThreadState *tstate, int margin_count) {
228-
assert(tstate->c_stack_soft_limit != UINTPTR_MAX);
229228
char here;
230229
uintptr_t here_addr = (uintptr_t)&here;
231230
if (here_addr > tstate->c_stack_soft_limit + margin_count * PYOS_STACK_MARGIN_BYTES) {
@@ -234,7 +233,7 @@ static inline int _Py_ReachedRecursionLimit(PyThreadState *tstate, int margin_co
234233
if (tstate->c_stack_hard_limit == 0) {
235234
_Py_InitializeRecursionCheck(tstate);
236235
}
237-
return here_addr <= stack_soft_limit + margin_count * PYOS_STACK_MARGIN_BYTES;
236+
return here_addr <= tstate->c_stack_soft_limit + margin_count * PYOS_STACK_MARGIN_BYTES;
238237
}
239238

240239
static inline void _Py_LeaveRecursiveCall(void) {

0 commit comments

Comments
 (0)