Insert extra braces to handle 'else if' without an 'else' correctly.

python · Oct 3, 2024 · de3b86c · de3b86c
1 parent efb5e7d
commit de3b86c
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 37 deletions.
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
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
@@ -802,11 +802,9 @@ dummy_func(void) {
             assert(value != NULL);
             eliminate_pop_guard(this_instr, !Py_IsNone(value));
         }
-        else {
-            if (sym_has_type(flag)) {
-                assert(!sym_matches_type(flag, &_PyNone_Type));
-                eliminate_pop_guard(this_instr, true);
-            }
+        else if (sym_has_type(flag)) {
+            assert(!sym_matches_type(flag, &_PyNone_Type));
+            eliminate_pop_guard(this_instr, true);
         }
     }
 
@@ -816,11 +814,9 @@ dummy_func(void) {
             assert(value != NULL);
             eliminate_pop_guard(this_instr, Py_IsNone(value));
         }
-        else {
-            if (sym_has_type(flag)) {
-                assert(!sym_matches_type(flag, &_PyNone_Type));
-                eliminate_pop_guard(this_instr, false);
-            }
+        else if (sym_has_type(flag)) {
+            assert(!sym_matches_type(flag, &_PyNone_Type));
+            eliminate_pop_guard(this_instr, false);
         }
     }
 

diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
diff --git a/Tools/cases_generator/generators_common.py b/Tools/cases_generator/generators_common.py
@@ -385,8 +385,12 @@ def _emit_if(
                 self.emit(next(tkn_iter))
                 maybe_if = tkn_iter.peek()
                 if maybe_if and maybe_if.kind == "IF":
+                    #Emit extra braces around the if to get scoping right
+                    self.emit(" {\n")
                     self.emit(next(tkn_iter))
                     else_reachable, rbrace, else_storage = self._emit_if(tkn_iter, uop, storage, inst)
+                    self.out.start_line()
+                    self.emit("}\n")
                 else:
                     else_reachable, rbrace, else_storage = self._emit_block(tkn_iter, uop, storage, inst, True)
                 if not reachable: