Skip to content

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

Merged
iritkatriel merged 102 commits into
python:mainfrom
iritkatriel:instr_ptr
Oct 26, 2023
Merged

gh-109094: replace frame->prev_instr by frame->instr_ptr#109095
iritkatriel merged 102 commits into
python:mainfrom
iritkatriel:instr_ptr

Conversation

@iritkatriel

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

Copy link
Copy Markdown
Member

@bedevere-botbedevere-bot mentioned this pull request Sep 7, 2023
Closed
gvanrossum
gvanrossum reviewed Oct 25, 2023
View reviewed changes
Comment threadPython/optimizer.c Outdated
gvanrossum
gvanrossum reviewed Oct 25, 2023
View reviewed changes
Comment threadPython/ceval.c Outdated
@gvanrossum

gvanrossum commented Oct 25, 2023

Copy link
Copy Markdown
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

gvanrossum commented Oct 25, 2023

Copy link
Copy Markdown
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

iritkatriel commented Oct 25, 2023

Copy link
Copy Markdown
MemberAuthor

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

iritkatriel commented Oct 26, 2023•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

I have made the requested changes; please review again.

@AlexWaygoodAlexWaygood mentioned this pull request Oct 26, 2023
Closed
markshannon
markshannon requested changes Oct 26, 2023
View reviewed changes

@markshannonmarkshannon left a comment

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.

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

Comment threadObjects/genobject.c
Comment threadInclude/internal/pycore_frame.h Outdated
Comment threadInclude/internal/pycore_frame.h Outdated
Comment threadInclude/internal/pycore_frame.h
Comment threadPython/bytecodes.c
Comment threadPython/bytecodes.c Outdated
Comment threadPython/ceval_macros.h Outdated
@markshannon

markshannon commented Oct 26, 2023

Copy link
Copy Markdown
Member

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

@iritkatriel

iritkatriel commented Oct 26, 2023

Copy link
Copy Markdown
MemberAuthor

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

@markshannonmarkshannon left a comment •
edited
Loading

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.

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:mainOct 26, 2023
@sobolevnsobolevn 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)
@iritkatrieliritkatriel mentioned this pull request May 24, 2024
Closed
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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gvanrossumgvanrossumgvanrossum left review comments
@markshannonmarkshannonmarkshannon approved these changes
@brandtbucherbrandtbucherAwaiting 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