Skip to content

GH-123391: Code generators: Track stack and locals in if statements. #123469

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

Closed
markshannon wants to merge 20 commits into from
Closed

GH-123391: Code generators: Track stack and locals in if statements. #123469

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
75bda28
Add copy and == support to Stack class
markshannon Aug 7, 2024
c7e9102
Merge branch 'main' into stack-copy-and-merge
markshannon Aug 8, 2024
d331371
blacken stack.py
markshannon Aug 8, 2024
4673d8a
Cases generator: Track reachability and divergent stacks in if statem…
markshannon Aug 8, 2024
132df06
Fix type errors and rename ahead to look_ahead
markshannon Aug 9, 2024
b7f71d4
Track state of output variables
markshannon Aug 9, 2024
b97dea9
Handle stack and output locals togather as Storage class
markshannon Aug 9, 2024
9838a05
Track locals as well as stack on differing paths
markshannon Aug 9, 2024
1f829be
Use 'PEP 7' in syntax error, to make it clear that this is not a C sy…
markshannon Aug 27, 2024
d2e5f12
Push peeks back to stack in optimizer code gen
markshannon Aug 27, 2024
2753014
Merge branch 'main' into stack-copy-and-merge
markshannon Aug 27, 2024
1754fc4
Update test
markshannon Aug 27, 2024
98f9720
Cleanup whitespace
markshannon Aug 27, 2024
0284b3f
Add tests for PEP 7 parsing and escaping call in condition
markshannon Aug 27, 2024
03bea71
Remove merge artifact
markshannon Aug 27, 2024
ca2f457
Remove test for escaping calls in conditions
markshannon Aug 27, 2024
57de61f
Spill before escaping calls. Initial attempt
markshannon Aug 29, 2024
a2e430a
Clean up asserts
markshannon Aug 29, 2024
95408d3
Update test
markshannon Aug 29, 2024
eb3a645
Flush locals as well on error
markshannon Aug 29, 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
Prev Previous commit
Next Next commit
Fix type errors and rename ahead to look_ahead
  • Loading branch information
@markshannon
markshannon committed Aug 9, 2024
commit 132df06a740ad37296d5396efd7c15dd5d65a3a7
18 changes: 9 additions & 9 deletions Tools/cases_generator/generators_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@

class TokenIterator:

ahead: Token | None
look_ahead: Token | None
iterator: Iterator[Token]

def __init__(self, tkns: Iterable[Token]):
self.iterator = iter(tkns)
self.ahead = None
self.look_ahead = None

def __iter__(self) -> "TokenIterator":
return self

def __next__(self) -> Token:
if self.ahead is None:
if self.look_ahead is None:
return next(self.iterator)
else:
res = self.ahead
self.ahead = None
res = self.look_ahead
self.look_ahead = None
return res

def peek(self) -> Token | None:
if self.ahead is None:
if self.look_ahead is None:
try:
self.ahead = next(self.iterator)
self.look_ahead = next(self.iterator)
except StopIteration:
pass
return self.ahead
return self.look_ahead

ROOT = Path(__file__).parent.parent.parent
DEFAULT_INPUT = (ROOT / "Python/bytecodes.c").absolute().as_posix()
Expand Down Expand Up @@ -176,7 +176,7 @@ def error_if(
self.out.emit(label)
self.out.emit(";\n")
self.out.emit("}\n")
return first_tkn.text != "true" and first_tkn.text != "1"
return not always_true(first_tkn)

def error_no_pop(
self,
Expand Down
5 changes: 3 additions & 2 deletions Tools/cases_generator/tier2_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
type_and_null,
Emitter,
TokenIterator,
always_true,
)
from cwriter import CWriter
from typing import TextIO, Iterator
Expand Down Expand Up @@ -122,7 +123,7 @@ def deopt_if(
self.emit("UOP_STAT_INC(uopcode, miss);\n")
self.emit("JUMP_TO_JUMP_TARGET();\n")
self.emit("}\n")
return first_tkn.text != "true" and first_tkn.text != "1"
return not always_true(first_tkn)

def exit_if( # type: ignore[override]
self,
Expand All @@ -142,7 +143,7 @@ def exit_if( # type: ignore[override]
self.emit("UOP_STAT_INC(uopcode, miss);\n")
self.emit("JUMP_TO_JUMP_TARGET();\n")
self.emit("}\n")
return first_tkn.text != "true" and first_tkn.text != "1"
return not always_true(first_tkn)

def oparg(
self,
Expand Down