Fix bugs from upstream

Author: Fidget-Spinner

Lib/test/test_generated_cases.py

@@ -672,7 +672,7 @@ def test_suppress_dispatch(self):
             goto somewhere;
         }
 
-        somewhere:
+        LABEL(somewhere)
         {
 
         }
@@ -1837,14 +1837,14 @@ def test_spilled_label(self):
         """
 
         output = """
-        one:
+        LABEL(one)
         {
             /* STACK SPILLED */
             stack_pointer = _PyFrame_GetStackPointer(frame);
             goto two;
         }
 
-        two:
+        LABEL(two)
         {
             _PyFrame_SetStackPointer(frame, stack_pointer);
             goto one;
@@ -1896,14 +1896,18 @@ def test_multiple_labels(self):
         LABEL(my_label_1)
         {
             // Comment
+            _PyFrame_SetStackPointer(frame, stack_pointer);
             do_thing1();
+            stack_pointer = _PyFrame_GetStackPointer(frame);
             goto my_label_2;
         }
 
         LABEL(my_label_2)
         {
             // Comment
+            _PyFrame_SetStackPointer(frame, stack_pointer);
             do_thing2();
+            stack_pointer = _PyFrame_GetStackPointer(frame);
             goto my_label_1;
         }
         """

Python/bytecodes.c

@@ -5309,8 +5309,7 @@ dummy_func(
             RELOAD_STACK();
 #ifdef Py_TAIL_CALL_INTERP
             int opcode;
-            (void)(opcode);
-#endif            
+#endif
             DISPATCH();
         }
 
@@ -5360,8 +5359,7 @@ dummy_func(
             RELOAD_STACK();
 #ifdef Py_TAIL_CALL_INTERP
             int opcode;
-            (void)(opcode);
-#endif            
+#endif
             DISPATCH();
         }
 

Python/generated_cases.c.h

@@ -404,7 +404,7 @@ def stack_pointer(
         self.emit(tkn)
         return True
 
-    def goto_label(self, goto: Token, label: Token, storage: Storage) -> None:
+    def goto_label(self, goto: Token, label: Token, storage: Storage, wrap_paren: bool = False) -> None:
         if label.text not in self.labels:
             print(self.labels.keys())
             raise analysis_error(f"Label '{label.text}' does not exist", label)
@@ -415,7 +415,11 @@ def goto_label(self, goto: Token, label: Token, storage: Storage) -> None:
         elif storage.spilled:
             raise analysis_error("Cannot jump from spilled label without reloading the stack pointer", goto)
         self.out.emit(goto)
+        if wrap_paren:
+            self.out.emit("(")
         self.out.emit(label)
+        if wrap_paren:
+            self.out.emit(")")
 
     def emit_save(self, storage: Storage) -> None:
         storage.save(self.out)
@@ -607,7 +611,7 @@ def _emit_block(
                 elif tkn.kind == "GOTO":
                     label_tkn = next(tkn_iter)
                     self.goto_label(tkn, label_tkn, storage)
-                    reachable = False;
+                    reachable = False
                 elif tkn.kind == "IDENTIFIER":
                     if tkn.text in self._replacers:
                         if not self._replacers[tkn.text](tkn, tkn_iter, uop, storage, inst):
@@ -623,8 +627,13 @@ def _emit_block(
                             self._print_storage(storage)
                             reachable = False
                         if tkn.text.startswith("JUMP_TO_LABEL"):
+                            next(tkn_iter)
+                            label_tkn = next(tkn_iter)
+                            next(tkn_iter)
+                            self.goto_label(tkn, label_tkn, storage, wrap_paren=True)
                             reachable = False
-                        self.out.emit(tkn)
+                        else:
+                            self.out.emit(tkn)
                 elif tkn.kind == "IF":
                     self.out.emit(tkn)
                     if_reachable, rbrace, storage = self._emit_if(tkn_iter, uop, storage, inst)