refactor

Author: Fidget-Spinner

Python/ceval.c

@@ -808,9 +808,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 #ifdef Py_STATS
     int lastopcode = 0;
 #endif
+#ifndef Py_TAIL_CALL_INTERP
     uint8_t opcode;    /* Current opcode */
     int oparg;         /* Current opcode argument, if any */
-
+#endif
     _PyInterpreterFrame entry_frame;
 
 
@@ -890,15 +891,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 resume_frame:
     stack_pointer = _PyFrame_GetStackPointer(frame);
 
-#ifdef LLTRACE
-    {
-        int lltrace = maybe_lltrace_resume_frame(frame, GLOBALS());
-        frame->lltrace = lltrace;
-        if (lltrace < 0) {
-            goto exit_unwind;
-        }
-    }
-#endif
+    LLTRACE_RESUME_FRAME();
 
 #ifdef Py_DEBUG
     /* _PyEval_EvalFrameDefault() must not be called with an exception set,

Python/ceval_macros.h

@@ -144,7 +144,6 @@ do { \
     }
 
 #ifdef Py_TAIL_CALL_INTERP
-#ifdef LLTRACE
 #define DISPATCH_INLINED(NEW_FRAME) \
     do { \
         assert(tstate->interp->eval_frame == NULL); \
@@ -157,31 +156,11 @@ do { \
         } \
         next_instr = frame->instr_ptr; \
         stack_pointer = _PyFrame_GetStackPointer(frame); \
-        lltrace = maybe_lltrace_resume_frame(frame, GLOBALS()); \
-        if (lltrace < 0) { \
-            goto exit_unwind; \
-        } \
+        LLTRACE_RESUME_FRAME(); \
         NEXTOPARG(); \
         DISPATCH_GOTO(); \
     } while (0)
 #else
-#define DISPATCH_INLINED(NEW_FRAME) \
-do { \
-        assert(tstate->interp->eval_frame == NULL); \
-        _PyFrame_SetStackPointer(frame, stack_pointer); \
-        assert((NEW_FRAME)->previous == frame); \
-        frame = tstate->current_frame = (NEW_FRAME); \
-        CALL_STAT_INC(inlined_py_calls); \
-        if (_Py_EnterRecursivePy(tstate)) { \
-            goto exit_unwind; \
-        } \
-        next_instr = frame->instr_ptr; \
-        stack_pointer = _PyFrame_GetStackPointer(frame); \
-        NEXTOPARG(); \
-        DISPATCH_GOTO(); \
-    } while (0)
-#endif
-#else
 #define DISPATCH_INLINED(NEW_FRAME)                     \
     do {                                                \
         assert(tstate->interp->eval_frame == NULL);     \