Skip to content
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

Jump to bottom

gh-109094: replace frame->prev_instr by frame->instr_ptr #109095

Merged
merged 102 commits into from
Oct 26, 2023
Merged

gh-109094: replace frame->prev_instr by frame->instr_ptr #109095

merged 102 commits into from
Oct 26, 2023

Conversation

iritkatriel
Copy link
Member

@iritkatriel iritkatriel commented Sep 7, 2023 •
edited by bedevere-bot
Loading

@bedevere-bot bedevere-bot mentioned this pull request Sep 7, 2023
Closed
gvanrossum
gvanrossum reviewed Oct 25, 2023
View reviewed changes
Python/optimizer.c Outdated Show resolved Hide resolved
gvanrossum
gvanrossum reviewed Oct 25, 2023
View reviewed changes
Python/ceval.c Outdated Show resolved Hide resolved
@gvanrossum
Copy link
Member

For me, the only thing that prevent this from being merged is the failing gdb test. Maybe you can get help on Discord? Mark should still review it one more time.

@gvanrossum
Copy link
Member

(When you turn on uops all the time there are some additional failures in test_embed, but those are also on main; it's the thing Brandt reported. I'm looking into a shorter repro.)

@iritkatriel
Copy link
Member Author

For me, the only thing that prevent this from being merged is the failing gdb test. Maybe you can get help on Discord? Mark should still review it one more time.

I'll look into the gdb tests tomorrow.

@iritkatriel
Copy link
Member Author

iritkatriel commented Oct 26, 2023 •
edited
Loading

I have made the requested changes; please review again.

@AlexWaygood AlexWaygood mentioned this pull request Oct 26, 2023
Closed
markshannon
markshannon requested changes Oct 26, 2023
View reviewed changes
Copy link
Member

@markshannon markshannon left a comment

Choose a reason for hiding this comment

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

A few minor comments and questions, but looks good overall.

Objects/genobject.c Show resolved Hide resolved
Include/internal/pycore_frame.h Outdated Show resolved Hide resolved
Include/internal/pycore_frame.h Outdated Show resolved Hide resolved
Include/internal/pycore_frame.h Show resolved Hide resolved
Python/bytecodes.c Show resolved Hide resolved
Python/bytecodes.c Outdated Show resolved Hide resolved
Python/ceval_macros.h Outdated Show resolved Hide resolved
@markshannon
Copy link
Member

All test except test_embed pass with export PYTHONUOPS=1
The test_embed failure looks like the same as on main.

@iritkatriel
Copy link
Member Author

I have made the requested changes; please review again.

@markshannon markshannon self-requested a review October 26, 2023 13:10
markshannon
markshannon approved these changes Oct 26, 2023
View reviewed changes
Copy link
Member

@markshannon markshannon left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good. A definite improvement over the increasingly mis-named prev_instr

@iritkatriel iritkatriel enabled auto-merge (squash) October 26, 2023 13:36
@iritkatriel iritkatriel merged commit 67a91f7 into python:main Oct 26, 2023
31 checks passed
@sobolevn sobolevn mentioned this pull request Oct 27, 2023
Closed
aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
@iritkatriel @aisk
pythongh-109094: replace frame->prev_instr by frame->instr_ptr (pytho…
bc7df6b 
…n#109095)
@iritkatriel iritkatriel mentioned this pull request May 24, 2024
Open
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
@iritkatriel @Glyphack
pythongh-109094: replace frame->prev_instr by frame->instr_ptr (pytho…
feb4455 
…n#109095)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gvanrossum gvanrossum gvanrossum left review comments

@markshannon markshannon markshannon approved these changes

@brandtbucher brandtbucher Awaiting requested review from brandtbucher

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iritkatriel @gvanrossum @markshannon