apply review suggestions

Author: Fidget-Spinner

Python/optimizer_analysis.c

@@ -187,7 +187,8 @@ incorrect_keys(PyObject *obj, uint32_t version)
 #define sym_new_truthiness _Py_uop_sym_new_truthiness
 
 #define JUMP_TO_LABEL(label) goto label;
-#define CHECK_STACK_BOUNDS() do { \
+#define CHECK_STACK_BOUNDS() \
+do { \
     if (!CURRENT_FRAME_IS_INIT_SHIM() && (STACK_LEVEL() < 0 || STACK_LEVEL() > STACK_SIZE())) { \
         ctx->contradiction = true; \
         ctx->done = true; \

Tools/cases_generator/optimizer_generator.py

@@ -148,7 +148,7 @@ def __init__(self, out: CWriter, labels: dict[str, Label], original_uop: Uop, st
         self.stack = stack
 
     def emit_save(self, storage: Storage) -> None:
-        storage.flush(self.out, check_stack_bounds=True)
+        storage.flush(self.out)
 
     def sync_sp(
         self,
@@ -162,7 +162,7 @@ def sync_sp(
         next(tkn_iter)
         next(tkn_iter)
         storage.clear_inputs("when syncing stack")
-        storage.flush(self.out, check_stack_bounds=True)
+        storage.flush(self.out)
         storage.stack.clear(self.out)
         return True
 
@@ -272,7 +272,7 @@ def replace_opcode_if_evaluates_pure(
                         emitter.emit("}\n")
                         emitter.emit("}\n")
 
-        storage.flush(self.out, check_stack_bounds=True)
+        storage.flush(self.out)
         emitter.emit("break;\n")
         emitter.emit("}\n")
         return True
@@ -413,12 +413,12 @@ def write_uop(
                 var.in_local = False
             _, storage = emitter.emit_tokens(override, storage, None, False)
             out.start_line()
-            storage.flush(out, check_stack_bounds=True)
+            storage.flush(out)
             out.start_line()
         else:
             emit_default(out, uop, stack)
             out.start_line()
-            stack.flush(out, check_stack_bounds=True)
+            stack.flush(out)
     except StackError as ex:
         raise analysis_error(ex.args[0], prototype.body.open) # from None
 
@@ -461,7 +461,7 @@ def generate_abstract_interpreter(
             declare_variables(override, out, skip_inputs=False)
         else:
             declare_variables(uop, out, skip_inputs=True)
-        stack = Stack()
+        stack = Stack(check_stack_bounds=True)
         write_uop(override, uop, out, stack, debug, skip_inputs=(override is None))
         out.start_line()
         out.emit("break;\n")

Tools/cases_generator/stack.py

@@ -216,11 +216,12 @@ def array_or_scalar(var: StackItem | Local) -> str:
     return "array" if var.is_array() else "scalar"
 
 class Stack:
-    def __init__(self) -> None:
+    def __init__(self, check_stack_bounds: bool = False) -> None:
         self.base_offset = PointerOffset.zero()
         self.physical_sp = PointerOffset.zero()
         self.logical_sp = PointerOffset.zero()
         self.variables: list[Local] = []
+        self.check_stack_bounds = check_stack_bounds
 
     def drop(self, var: StackItem, check_liveness: bool) -> None:
         self.logical_sp = self.logical_sp.pop(var)
@@ -291,12 +292,12 @@ def _do_emit(
     ) -> None:
         out.emit(f"stack_pointer[{stack_offset.to_c()}] = {var.name};\n")
 
-    def _save_physical_sp(self, out: CWriter, check_stack_bounds: bool) -> None:
+    def _save_physical_sp(self, out: CWriter) -> None:
         if self.physical_sp != self.logical_sp:
             diff = self.logical_sp - self.physical_sp
             out.start_line()
             out.emit(f"stack_pointer += {diff.to_c()};\n")
-            if check_stack_bounds:
+            if self.check_stack_bounds:
                 out.emit("CHECK_STACK_BOUNDS();\n")
             else:
                 out.emit(f"assert(WITHIN_STACK_BOUNDS());\n")
@@ -319,10 +320,10 @@ def save_variables(self, out: CWriter) -> None:
                 self._print(out)
             var_offset = var_offset.push(var.item)
 
-    def flush(self, out: CWriter, check_stack_bounds: bool = False) -> None:
+    def flush(self, out: CWriter) -> None:
         self._print(out)
         self.save_variables(out)
-        self._save_physical_sp(out, check_stack_bounds)
+        self._save_physical_sp(out)
         out.start_line()
 
     def is_flushed(self) -> bool:
@@ -350,6 +351,7 @@ def copy(self) -> "Stack":
         other.physical_sp = self.physical_sp
         other.logical_sp = self.logical_sp
         other.variables = [var.copy() for var in self.variables]
+        other.check_stack_bounds = self.check_stack_bounds
         return other
 
     def __eq__(self, other: object) -> bool:
@@ -501,10 +503,10 @@ def locals_cached(self) -> bool:
                 return True
         return False
 
-    def flush(self, out: CWriter, check_stack_bounds: bool = False) -> None:
+    def flush(self, out: CWriter) -> None:
         self.clear_dead_inputs()
         self._push_defined_outputs()
-        self.stack.flush(out, check_stack_bounds=check_stack_bounds)
+        self.stack.flush(out)
 
     def save(self, out: CWriter) -> None:
         assert self.spilled >= 0