Improve similarity between _PUSH_FRAME and DISPATCH_INLINED()

gvanrossum · Oct 10, 2023 · 630aee7 · 630aee7
1 parent 5f1f360
commit 630aee7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -3100,8 +3100,8 @@ dummy_func(
             assert(tstate->interp->eval_frame == NULL);
             STORE_SP();
             new_frame->previous = frame;
-            CALL_STAT_INC(inlined_py_calls);
             frame = tstate->current_frame = new_frame;
+            CALL_STAT_INC(inlined_py_calls);
             tstate->py_recursion_remaining--;
             LOAD_SP();
             LOAD_IP();

diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
@@ -106,10 +106,10 @@
 #define DISPATCH_INLINED(NEW_FRAME)                     \
     do {                                                \
         assert(tstate->interp->eval_frame == NULL);     \
-        _PyFrame_SetStackPointer(frame, stack_pointer); \
+        STORE_SP();                                     \
         frame->prev_instr = next_instr - 1;             \
         (NEW_FRAME)->previous = frame;                  \
-        frame = tstate->current_frame = (NEW_FRAME);     \
+        frame = tstate->current_frame = (NEW_FRAME);    \
         CALL_STAT_INC(inlined_py_calls);                \
         goto start_frame;                               \
     } while (0)

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