From: Guido van Rossum <guido@python.org>
Date: Sat, 5 Aug 2023 04:50:36 +0000 (-0700)
Subject: gh-106812: Fix two tiny bugs in analysis.py (#107649)
X-Git-Tag: v3.13.0a1~1070
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85e5b1f5b806289744ef9a5a13dabfb23044f713;p=thirdparty%2FPython%2Fcpython.git

gh-106812: Fix two tiny bugs in analysis.py (#107649)

This fixes two tiny defects in analysis.py that I didn't catch on time in #107564:

- `get_var_names` in `check_macro_consistency` should skip `UNUSED` names.
- Fix an occurrence of `is UNUSED` (should be `==`).
---

diff --git a/Tools/cases_generator/analysis.py b/Tools/cases_generator/analysis.py
index bd8918a87ffe..2db1cd01c19a 100644
--- a/Tools/cases_generator/analysis.py
+++ b/Tools/cases_generator/analysis.py
@@ -297,6 +297,8 @@ class Analyzer:
         def get_var_names(instr: Instruction) -> dict[str, StackEffect]:
             vars: dict[str, StackEffect] = {}
             for eff in instr.input_effects + instr.output_effects:
+                if eff.name == UNUSED:
+                    continue
                 if eff.name in vars:
                     if vars[eff.name] != eff:
                         self.error(
@@ -335,7 +337,7 @@ class Analyzer:
                 copies: list[tuple[StackEffect, StackEffect]] = []
                 while pushes and pops and pushes[-1] == pops[0]:
                     src, dst = pushes.pop(), pops.pop(0)
-                    if src.name == dst.name or dst.name is UNUSED:
+                    if src.name == dst.name or dst.name == UNUSED:
                         continue
                     copies.append((src, dst))
                 reads = set(copy[0].name for copy in copies)