cleanup

Author: Fidget-Spinner

Python/bytecodes.c

@@ -5208,6 +5208,10 @@ dummy_func(
             if (lltrace < 0) {
                 goto exit_unwind;
             }
+        /* _PyEval_EvalFrameDefault() must not be called with an exception set,
+        because it can clear it (directly or indirectly) and so the
+        caller loses its exception */
+        assert(!_PyErr_Occurred(tstate));
 #endif
 #if defined(Py_TAIL_CALL_INTERP) && !defined(IN_TAIL_CALL_INTERP)
             return _TAIL_CALL_entry(frame, stack_pointer, tstate, next_instr, 0, 0);

Python/ceval.c

@@ -865,27 +865,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
     const _PyUOpInstruction *next_uop = NULL;
 #endif
 
-    if (_Py_EnterRecursivePy(tstate)) {
-        goto exit_unwind;
-    }
-
-    next_instr = frame->instr_ptr;
-    stack_pointer = _PyFrame_GetStackPointer(frame);
 
-    LLTRACE_RESUME_FRAME();
-
-#ifdef Py_DEBUG
-    /* _PyEval_EvalFrameDefault() must not be called with an exception set,
-       because it can clear it (directly or indirectly) and so the
-       caller loses its exception */
-    assert(!_PyErr_Occurred(tstate));
-#endif
+    goto start_frame;
 
-#ifdef Py_TAIL_CALL_INTERP
-    return _TAIL_CALL_entry(frame, stack_pointer, tstate, next_instr, 0, 0);
-#else
-    DISPATCH();
-#endif
 
 #include "generated_cases.c.h"