fix tests

Author: Fidget-Spinner

Lib/test/test_generated_cases.py

@@ -2115,8 +2115,9 @@ def test_validate_uop_unused_input(self):
         """
         output = """
         case OP: {
+            CHECK_STACK_BOUNDS(-1);
             stack_pointer += -1;
-            CHECK_STACK_BOUNDS();
+            ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             break;
         }
         """
@@ -2132,8 +2133,9 @@ def test_validate_uop_unused_input(self):
         """
         output = """
         case OP: {
+            CHECK_STACK_BOUNDS(-1);
             stack_pointer += -1;
-            CHECK_STACK_BOUNDS();
+            ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             break;
         }
         """
@@ -2153,9 +2155,10 @@ def test_validate_uop_unused_output(self):
         case OP: {
             JitOptRef foo;
             foo = NULL;
+            CHECK_STACK_BOUNDS(1);
             stack_pointer[0] = foo;
             stack_pointer += 1;
-            CHECK_STACK_BOUNDS();
+            ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             break;
         }
         """
@@ -2172,8 +2175,9 @@ def test_validate_uop_unused_output(self):
         """
         output = """
         case OP: {
+            CHECK_STACK_BOUNDS(1);
             stack_pointer += 1;
-            CHECK_STACK_BOUNDS();
+            ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             break;
         }
         """

Python/optimizer_analysis.c

@@ -190,7 +190,7 @@ incorrect_keys(PyObject *obj, uint32_t version)
 #define CHECK_STACK_BOUNDS(offset) \
 do { \
     int stack_level = (int)(stack_pointer + (offset) - ctx->frame->stack); \
-    if (!CURRENT_FRAME_IS_INIT_SHIM() && (stack_level < 0 || stack_level > STACK_SIZE())) { \
+    if (stack_level < 0 || stack_level > STACK_SIZE()) { \
         ctx->contradiction = true; \
         ctx->done = true; \
         break; \

Python/optimizer_cases.c.h

@@ -321,7 +321,8 @@ def stack_bound_check(self, out: CWriter):
         if not self.check_stack_bounds:
             return
         if self.physical_sp != self.logical_sp:
-            diff =  self.logical_sp - self.physical_sp
+            diff = self.logical_sp - self.physical_sp
+            out.start_line()
             out.emit(f"CHECK_STACK_BOUNDS({diff});\n")
 
     def flush(self, out: CWriter) -> None: