mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-104504: cases generator: Add --warn-unreachable to the mypy config (#108112)

Browse source
This commit is contained in:
Alex Waygood 2023-08-21 00:40:41 +01:00 • committed by GitHub
parent 6323bc33ff
commit 05ef4ca94c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Tools/cases_generator/generate_cases.py
View file

@ -13,6 +13,7 @@ import typing
from collections.abc import Iterator
import stacking # Early import to avoid circular import
from _typing_backports import assert_never
from analysis import Analyzer
from formatting import Formatter, list_effect_size
from flags import InstructionFlags, variable_used
@ -146,7 +147,7 @@ arg_parser.add_argument(
class Generator(Analyzer):
def get_stack_effect_info(
self, thing: parsing.InstDef | parsing.Macro | parsing.Pseudo
) -> tuple[AnyInstruction | None, str | None, str | None]:
) -> tuple[AnyInstruction | None, str, str]:
def effect_str(effects: list[StackEffect]) -> str:
n_effect, sym_effect = list_effect_size(effects)
if sym_effect:
@ -154,8 +155,6 @@ class Generator(Analyzer):
return str(n_effect)
instr: AnyInstruction | None
popped: str | None
pushed: str | None
match thing:
case parsing.InstDef():
if thing.kind != "op" or self.instrs[thing.name].is_viable_uop():
@ -171,10 +170,9 @@ class Generator(Analyzer):
popped, pushed = stacking.get_stack_effect_info_for_macro(instr)
case parsing.Pseudo():
instr = self.pseudo_instrs[thing.name]
popped = pushed = None
# Calculate stack effect, and check that it's the the same
# for all targets.
for target in self.pseudos[thing.name].targets:
for idx, target in enumerate(self.pseudos[thing.name].targets):
target_instr = self.instrs.get(target)
# Currently target is always an instr. This could change
# in the future, e.g., if we have a pseudo targetting a
@ -182,14 +180,13 @@ class Generator(Analyzer):
assert target_instr
target_popped = effect_str(target_instr.input_effects)
target_pushed = effect_str(target_instr.output_effects)
if pushed is None:
assert popped is None
if idx == 0:
popped, pushed = target_popped, target_pushed
else:
assert popped == target_popped
assert pushed == target_pushed
case _:
typing.assert_never(thing)
assert_never(thing)
return instr, popped, pushed
@contextlib.contextmanager
@ -209,7 +206,6 @@ class Generator(Analyzer):
continue
instr, popped, pushed = self.get_stack_effect_info(thing)
if instr is not None:
assert popped is not None and pushed is not None
popped_data.append((instr, popped))
pushed_data.append((instr, pushed))
@ -379,7 +375,6 @@ class Generator(Analyzer):
# Compute the set of all instruction formats.
all_formats: set[str] = set()
for thing in self.everything:
format: str | None
match thing:
case OverriddenInstructionPlaceHolder():
continue
@ -388,17 +383,15 @@ class Generator(Analyzer):
case parsing.Macro():
format = self.macro_instrs[thing.name].instr_fmt
case parsing.Pseudo():
format = None
for target in self.pseudos[thing.name].targets:
for idx, target in enumerate(self.pseudos[thing.name].targets):
target_instr = self.instrs.get(target)
assert target_instr
if format is None:
if idx == 0:
format = target_instr.instr_fmt
else:
assert format == target_instr.instr_fmt
assert format is not None
case _:
typing.assert_never(thing)
assert_never(thing)
all_formats.add(format)
# Turn it into a sorted list of enum values.
@ -488,7 +481,7 @@ class Generator(Analyzer):
self.pseudo_instrs[thing.name]
)
case _:
typing.assert_never(thing)
assert_never(thing)
with self.metadata_item(
"const struct opcode_macro_expansion "
@ -525,7 +518,7 @@ class Generator(Analyzer):
case parsing.Pseudo():
pass
case _:
typing.assert_never(thing)
assert_never(thing)
with self.metadata_item(
"const char * const _PyOpcode_uop_name[OPCODE_UOP_NAME_SIZE]", "=", ";"
@ -774,7 +767,7 @@ class Generator(Analyzer):
case parsing.Pseudo():
pass
case _:
typing.assert_never(thing)
assert_never(thing)
print(
f"Wrote {n_instrs} instructions and {n_macros} macros "
@ -818,7 +811,7 @@ class Generator(Analyzer):
case parsing.Pseudo():
pass
case _:
typing.assert_never(thing)
assert_never(thing)
print(
f"Wrote {n_instrs} instructions and {n_uops} ops to {executor_filename}",
file=sys.stderr,
@ -850,7 +843,7 @@ class Generator(Analyzer):
case parsing.Pseudo():
pass
case _:
typing.assert_never(thing)
assert_never(thing)
print(
f"Wrote some stuff to {abstract_interpreter_filename}",
file=sys.stderr,