Merge upstream changes, remove complicated hack

Author: Fidget-Spinner

Python/bytecodes.c

@@ -5213,11 +5213,7 @@ dummy_func(
         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);
-#else
             DISPATCH();
-#endif
         }
 
         label(pop_4_error) {
@@ -5313,14 +5309,7 @@ dummy_func(
                 lltrace_resume_frame(frame);
             }
 #endif
-        // This is a little complicated...
-        // If we are in a tail call handler, we want to tail call (DISPATCH).
-        // If we're not then we need the shim frame.
-#if defined(Py_TAIL_CALL_INTERP) && !defined(IN_TAIL_CALL_INTERP)
-            return _TAIL_CALL_entry(frame, stack_pointer, tstate, next_instr, 0, 0);
-#else
             DISPATCH();
-#endif
         }
 
         label(exit_unwind) {

Python/ceval.c

@@ -865,7 +865,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
     const _PyUOpInstruction *next_uop = NULL;
 #endif
 
+#ifdef Py_TAIL_CALL_INTERP
+    return _TAIL_CALL_start_frame(frame, stack_pointer, tstate, next_instr, 0, 0);
+#else
     goto start_frame;
+#endif
 
 #include "generated_cases.c.h"