Don't ever decrement datastack_top!

python · Mar 6, 2024 · 2f9539b · 2f9539b
1 parent c7ad988
commit 2f9539b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -4160,9 +4160,11 @@ dummy_func(
 
         op(_GROW_TIER2_FRAME, (--)) {
             DEOPT_IF(frame->owner != FRAME_OWNED_BY_THREAD);
-            DEOPT_IF(stack_pointer + oparg > tstate->datastack_limit);
             assert(stack_pointer <= tstate->datastack_top);
-            tstate->datastack_top = stack_pointer + oparg;
+            if (stack_pointer + oparg > tstate->datastack_top) {
+                DEOPT_IF(stack_pointer + oparg > tstate->datastack_limit);
+                tstate->datastack_top = stack_pointer + oparg;
+            }
         }
 
 

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h