python · iritkatriel · Aug 25, 2023 · Aug 21, 2023 · Aug 23, 2023 · Aug 24, 2023
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
@@ -381,7 +381,8 @@ def analyze_pseudo(self, pseudo: parsing.Pseudo) -> PseudoInstruction:
        # Make sure the targets have the same fmt
        fmts = list(set([t.instr_fmt for t in targets]))
        assert len(fmts) == 1
-        assert len(list(set([t.instr_flags.bitmap() for t in targets]))) == 1
+        ignored_flags = {'HAS_EVAL_BREAK_FLAG'}
+        assert len({t.instr_flags.bitmap(ignore=ignored_flags) for t in targets}) == 1
        return PseudoInstruction(pseudo.name, targets, fmts[0], targets[0].instr_flags)

    def analyze_instruction(

@@ -3,6 +3,7 @@
 from formatting import Formatter
 import lexer as lx
 import parsing
+from typing import AbstractSet


 @dataclasses.dataclass
@@ -15,6 +16,7 @@ class InstructionFlags:
    HAS_JUMP_FLAG: bool
    HAS_FREE_FLAG: bool
    HAS_LOCAL_FLAG: bool
+    HAS_EVAL_BREAK_FLAG: bool

    def __post_init__(self) -> None:
        self.bitmask = {name: (1 << i) for i, name in enumerate(self.names())}
@@ -37,11 +39,12 @@ def fromInstruction(instr: parsing.Node) -> "InstructionFlags":
                variable_used(instr, "GETLOCAL") or variable_used(instr, "SETLOCAL")
            )
            and not has_free,
+            HAS_EVAL_BREAK_FLAG=variable_used(instr, "CHECK_EVAL_BREAKER"),
        )

    @staticmethod
    def newEmpty() -> "InstructionFlags":
-        return InstructionFlags(False, False, False, False, False, False)
+        return InstructionFlags(False, False, False, False, False, False, False)

    def add(self, other: "InstructionFlags") -> None:
        for name, value in dataclasses.asdict(other).items():
@@ -53,10 +56,11 @@ def names(self, value: bool | None = None) -> list[str]:
            return list(dataclasses.asdict(self).keys())
        return [n for n, v in dataclasses.asdict(self).items() if v == value]

-    def bitmap(self) -> int:
+    def bitmap(self, ignore: AbstractSet[str] = frozenset()) -> int:
        flags = 0
+        assert all(hasattr(self, name) for name in ignore)
        for name in self.names():
-            if getattr(self, name):
+            if getattr(self, name) and name not in ignore:
                flags |= self.bitmask[name]
        return flags