Visitar URL original
GH-123391: Code generators: Track stack and locals in `if` statements. by markshannon · Pull Request #123397 · python/cpython · GitHub
Skip to content

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

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 16 commits into from
Closed

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

Changes from 1 commit
Commits
Show all changes
16 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
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
Next Next commit
Add copy and == support to Stack class
  • Loading branch information
@markshannon
markshannon committed Aug 7, 2024
commit 75bda2803addd6513c2187ed754ff73adbd1ff77
36 changes: 36 additions & 0 deletions Tools/cases_generator/stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,19 @@ def condition(self) -> str | None:
def is_array(self) -> bool:
return self.item.is_array()

def copy(self) -> Local:
return Local(self.item, self.cached, self.in_memory, self.defined)

def __eq__(self, other: object) -> bool:
if not isinstance(other, Local):
return NotImplemented
return (
self.item is other.item and
self.cached is other.cached and
self.in_memory is other.in_memory and
self.defined is other.defined
)

@dataclass
class StackOffset:
"The stack offset of the virtual base of the stack from the physical stack pointer"
Expand Down Expand Up @@ -159,12 +172,17 @@ def clear(self) -> None:
self.popped = []
self.pushed = []

def __eq__(self, other: object) -> bool:
if not isinstance(other, StackOffset):
return NotImplemented
return self.to_c() == other.to_c()

class StackError(Exception):
pass


class Stack:

def __init__(self) -> None:
self.top_offset = StackOffset.empty()
self.base_offset = StackOffset.empty()
Expand Down Expand Up @@ -296,6 +314,24 @@ def peek_offset(self) -> str:
def as_comment(self) -> str:
return f"/* Variables: {[v.name for v in self.variables]}. Base offset: {self.base_offset.to_c()}. Top offset: {self.top_offset.to_c()} */"

def copy(self) -> Stack:
other = Stack()
other.top_offset = self.top_offset.copy()
other.base_offset = self.base_offset.copy()
other.variables = [ var.copy() for var in self.variables ]
other.defined = set(self.defined)

@picnixz picnixz Aug 27, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
other.defined = set(self.defined)
other.defined = self.defined.copy()

return other

def __eq__(self, other: object) -> bool:
if not isinstance(other, Stack):
return NotImplemented
return (
self.top_offset == other.top_offset and
self.base_offset == other.base_offset and
self.variables == other.variables and
self.defined == other.defined
)


def get_stack_effect(inst: Instruction | PseudoInstruction) -> Stack:
stack = Stack()
Expand Down