Reduce diff to near minimal

Author: Fidget-Spinner

Python/executor_cases.c.h

@@ -135,30 +135,6 @@ def __init__(self, out: CWriter, labels: dict[str, Label], cannot_escape: bool =
         self.cannot_escape = cannot_escape
         self.jump_prefix = jump_prefix
 
-    def emit_to_with_replacement(
-        self,
-        out: CWriter,
-        tkn_iter: TokenIterator,
-        end: str,
-        uop: CodeSection,
-        storage: Storage,
-        inst: Instruction | None
-    ) -> Token:
-        parens = 0
-        for tkn in tkn_iter:
-            if tkn.kind == end and parens == 0:
-                return tkn
-            if tkn.kind == "LPAREN":
-                parens += 1
-            if tkn.kind == "RPAREN":
-                parens -= 1
-            if tkn.text in self._replacers:
-                self._replacers[tkn.text](tkn, tkn_iter, uop, storage, inst)
-            else:
-                out.emit(tkn)
-        raise analysis_error(f"Expecting {end}. Reached end of file", tkn)
-
-
     def dispatch(
         self,
         tkn: Token,
@@ -186,7 +162,7 @@ def deopt_if(
         lparen = next(tkn_iter)
         assert lparen.kind == "LPAREN"
         first_tkn = tkn_iter.peek()
-        self.emit_to_with_replacement(self.out, tkn_iter, "RPAREN", uop, storage, inst)
+        emit_to(self.out, tkn_iter, "RPAREN")
         self.emit(") {\n")
         next(tkn_iter)  # Semi colon
         assert inst is not None

Python/generated_cases.c.h

@@ -271,6 +271,29 @@ def __init__(self, out: CWriter, labels: dict[str, Label], original_uop: Uop, st
         self._replacers = {**self._replacers, **overrides}
         self.cannot_escape = True
 
+    def emit_to_with_replacement(
+        self,
+        out: CWriter,
+        tkn_iter: TokenIterator,
+        end: str,
+        uop: CodeSection,
+        storage: Storage,
+        inst: Instruction | None
+    ) -> Token:
+        parens = 0
+        for tkn in tkn_iter:
+            if tkn.kind == end and parens == 0:
+                return tkn
+            if tkn.kind == "LPAREN":
+                parens += 1
+            if tkn.kind == "RPAREN":
+                parens -= 1
+            if tkn.text in self._replacers:
+                self._replacers[tkn.text](tkn, tkn_iter, uop, storage, inst)
+            else:
+                out.emit(tkn)
+        raise analysis_error(f"Expecting {end}. Reached end of file", tkn)
+
     def emit_stackref_override(
         self,
         tkn: Token,

Tools/cases_generator/generators_common.py

@@ -64,8 +64,6 @@ def __init__(self, out: CWriter, labels: dict[str, Label]):
         super().__init__(out, labels)
         self._replacers["oparg"] = self.oparg
         self._replacers["IP_OFFSET_OF"] = self.ip_offset_of
-        self._replacers["LOCK_OBJECT"] = self.lock_object
-        self._replacers["UNLOCK_OBJECT"] = self.unlock_object
 
     def goto_error(self, offset: int, storage: Storage) -> str:
         # To do: Add jump targets for popping values.
@@ -86,7 +84,7 @@ def deopt_if(
         self.emit(lparen)
         assert lparen.kind == "LPAREN"
         first_tkn = tkn_iter.peek()
-        self.emit_to_with_replacement(self.out, tkn_iter, "RPAREN", uop, storage, inst)
+        emit_to(self.out, tkn_iter, "RPAREN")
         next(tkn_iter)  # Semi colon
         self.emit(") {\n")
         self.emit("UOP_STAT_INC(uopcode, miss);\n")
@@ -106,7 +104,7 @@ def exit_if(
         lparen = next(tkn_iter)
         self.emit(lparen)
         first_tkn = tkn_iter.peek()
-        self.emit_to_with_replacement(self.out, tkn_iter, "RPAREN", uop, storage, inst)
+        emit_to(self.out, tkn_iter, "RPAREN")
         next(tkn_iter)  # Semi colon
         self.emit(") {\n")
         self.emit("UOP_STAT_INC(uopcode, miss);\n")
@@ -156,29 +154,6 @@ def ip_offset_of(
         next(tkn_iter)
         return True
 
-    def lock_object(
-        self,
-        tkn: Token,
-        tkn_iter: TokenIterator,
-        uop: CodeSection,
-        storage: Storage,
-        inst: Instruction | None,
-    ) -> bool:
-        self.emit("1 && ")
-        return True
-
-    def unlock_object(
-        self,
-        tkn: Token,
-        tkn_iter: TokenIterator,
-        uop: CodeSection,
-        storage: Storage,
-        inst: Instruction | None,
-    ) -> bool:
-        self.out.start_line()
-        self.emit("(void)")
-        return True
-
 def write_uop(uop: Uop, emitter: Emitter, stack: Stack, offset_strs: dict[str, tuple[str, str]]) -> Stack:
     locals: dict[str, Local] = {}
     try: