Add _Py_LeaveRecursiveCallPy to _POP_FRAME

python · gvanrossum · Aug 17, 2023 · Aug 8, 2023 · Aug 8, 2023 · Aug 12, 2023
commit 7760028dbd6a89712a42330c1bf54531105903f9
@@ -770,13 +770,11 @@ dummy_func(
         op(_POP_FRAME, (retval --)) {
             assert(EMPTY());
             SAVE_FRAME_STATE();  // Signals to the code generator
-            #if TIER_ONE
             _Py_LeaveRecursiveCallPy(tstate);
-            assert(frame != &entry_frame);
-            #endif
             // GH-99729: We need to unlink the frame *before* clearing it:
             _PyInterpreterFrame *dying = frame;
             #if TIER_ONE
+            assert(frame != &entry_frame);
             frame = cframe.current_frame = dying->previous;
             #endif
             #if TIER_TWO

@@ -601,10 +601,6 @@ int _Py_CheckRecursiveCallPy(
 }
 
 
-static inline void _Py_LeaveRecursiveCallPy(PyThreadState *tstate)  {
-    tstate->py_recursion_remaining++;
-}
-
 static const _Py_CODEUNIT _Py_INTERPRETER_TRAMPOLINE_INSTRUCTIONS[] = {
     /* Put a NOP at the start, so that the IP points into
     * the code, rather than before it */

@@ -369,3 +369,7 @@ static inline int _Py_EnterRecursivePy(PyThreadState *tstate) {
     return (tstate->py_recursion_remaining-- <= 0) &&
         _Py_CheckRecursiveCallPy(tstate);
 }
+
+static inline void _Py_LeaveRecursiveCallPy(PyThreadState *tstate)  {
+    tstate->py_recursion_remaining++;
+}
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h