8000 GH-125521: Remove `if (true)` from generated output to reduce C compiler warnings by markshannon · Pull Request #125700 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-125521: Remove if (true) from generated output to reduce C compiler warnings #125700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2024
Merged

GH-125521: Remove if (true) from generated output to reduce C compiler warnings #125700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bc520b
Remove 'if (true)' from generated output to reduce C compiler warnings
markshannon Oct 18, 2024
4d0cf8e
Add tests and make sure '1' is treated as 'true' for reachability
markshannon Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions Lib/test/test_generated_cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,6 +1270,33 @@ def test_push_then_error(self):
"""
self.run_cases_test(input, output)

def test_error_if_true(self):

input = """
inst(OP1, ( --)) {
ERROR_IF(true, here);
}
inst(OP2, ( --)) {
ERROR_IF(1, there);
}
"""
output = """
TARGET(OP1) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(OP1);
goto here;
}

TARGET(OP2) {
frame->instr_ptr = next_instr;
next_instr += 1;
INSTRUCTION_STATS(OP2);
goto there;
}
"""
self.run_cases_test(input, output)

def test_scalar_array_inconsistency(self):

input = """
Expand Down
68 changes: 34 additions & 34 deletions Python/generated_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tools/cases_generator/analyzer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ def always_exits(op: parser.InstDef) -> bool:
if tkn.text == "DEOPT_IF" or tkn.text == "ERROR_IF":
next(tkn_iter) # '('
t = next(tkn_iter)
if t.text == "true":
if t.text in ("true", "1"):
return True
return False

Expand Down
18 changes: 13 additions & 5 deletions Tools/cases_generator/generators_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,24 @@ def error_if(
storage: Storage,
inst: Instruction | None,
) -> bool:
self.out.emit_at("if ", tkn)
lparen = next(tkn_iter)
self.emit(lparen)
assert lparen.kind == "LPAREN"
first_tkn = tkn_iter.peek()
emit_to(self.out, tkn_iter, "COMMA")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be simpler to just add an unconditional ERROR() macro to the DSL?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That wouldn't prevent anyone writing ERROR_IF(true, ...) so we'd still need to handle it.

unconditional = always_true(first_tkn)
if unconditional:
next(tkn_iter)
comma = next(tkn_iter)
if comma.kind != "COMMA":
raise analysis_error(f"Expected comma, got '{comma.text}'", comma)
self.out.start_line()
else:
self.out.emit_at("if ", tkn)
self.emit(lparen)
emit_to(self.out, tkn_iter, "COMMA")
self.out.emit(") ")
label = next(tkn_iter).text
next(tkn_iter) # RPAREN
next(tkn_iter) # Semi colon
self.out.emit(") ")
storage.clear_inputs("at ERROR_IF")
c_offset = storage.stack.peek_offset()
try:
Expand All @@ -196,7 +204,7 @@ def error_if(
self.out.emit(label)
self.out.emit(";\n")
self.out.emit("}\n")
return not always_true(first_tkn)
return not unconditional

def error_no_pop(
self,
Expand Down
Loading
0