Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-98831: Fix two bugs in case generator (#101349) 

Fix two bugs in case generator

- UndefinedLocalError when generating metadata for an 'op'
- Accidental newline inserted in test_generator.py
This commit is contained in:
Guido van Rossum 2023-01-26 09:15:05 -08:00 committed by GitHub
parent 409f5337a3
commit 9f2c479eaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/cases_generator/generate_cases.py
View File

@ -736,7 +736,7 @@ class Analyzer:
def get_stack_effect_info(
self, thing: parser.InstDef | parser.Super | parser.Macro
) -> tuple[Instruction, str, str]:
) -> tuple[Instruction|None, str, str]:
def effect_str(effect: list[StackEffect]) -> str:
if getattr(thing, 'kind', None) == 'legacy':
@ -752,6 +752,9 @@ class Analyzer:
instr = self.instrs[thing.name]
popped = effect_str(instr.input_effects)
pushed = effect_str(instr.output_effects)
else:
instr = None
popped = pushed = "", ""
case parser.Super():
instr = self.super_instrs[thing.name]
popped = '+'.join(effect_str(comp.instr.input_effects) for comp in instr.parts)
@ -770,8 +773,9 @@ class Analyzer:
pushed_data = []
for thing in self.everything:
instr, popped, pushed = self.get_stack_effect_info(thing)
popped_data.append( (instr, popped) )
pushed_data.append( (instr, pushed) )
if instr is not None:
popped_data.append( (instr, popped) )
pushed_data.append( (instr, pushed) )
def write_function(direction: str, data: list[tuple[Instruction, str]]) -> None:
self.out.emit("\n#ifndef NDEBUG");

3
Tools/cases_generator/test_generator.py
View File

@ -358,8 +358,7 @@ def test_macro_instruction():
{
PyObject *arg1 = _tmp_1;
PyObject *interim;
uint16_t counter = re
ad_u16(&next_instr[0].cache);
uint16_t counter = read_u16(&next_instr[0].cache);
interim = op1(arg1);
_tmp_1 = interim;
}