NotificationsYou must be signed in to change notification settings
Fork33.3k
Star69.7k

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

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.

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

Already on GitHub?Sign in to your account

Jump to bottom

Merged

iritkatriel merged 102 commits intopython:mainfromiritkatriel:instr_ptr

Oct 26, 2023

Merged

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

iritkatriel merged 102 commits intopython:mainfromiritkatriel:instr_ptr

Oct 26, 2023

Conversation

Copy link

Member

iritkatriel commentedSep 7, 2023•
edited by bedevere-bot
Loading

Issue:Replace frame->prev_instr by frame->instr_ptr #109094

bedevere-bot mentioned this pull request

Sep 7, 2023

Replace frame->prev_instr by frame->instr_ptr#109094

Closed

iritkatriel added14 commits

September 7, 2023 15:43

add instr_ptr and assert it's 1 more than prev_instr in SET_LOCALS_FR…

637b5da

…OM_FRAME

fix YIELD_VALUE

ffb980c

fix test_sys

82a5b92

update instr_ptr in _PyOptimizer_BackEdge

1fc0df1

All tests pass except test_jump_from_yield (which is disabled)

6bbb1c2

assert always

be6d428

remove unnecessary stuff

bbe8e2c

fix test_sys expected sizes

50a1f3a

add assert

4beb50b

use instr_ptr instead of prev_instr in genobject.c

8e4a310

update executor.c

58d3bc5

remove unecessary setting of prev_instr in _Py_call_instrumentation_jump

909de93

replace assignment by assertion in _Py_call_instrumentation_line

0a06b75

revert change to signature of _PyFrame_PushTrampolineUnchecked

da6c97b

iritkatriel force-pushed theinstr_ptr branch from7bb3b93 toda6c97bCompare

September 7, 2023 14:43

iritkatriel added6 commits

September 7, 2023 18:50

prev_instr --> previous_instr to avoid confusion

6488d69

revert change to JUMPBY

6c684b0

use instr_ptr in _PyFrame_OpAlreadyRan

b6a8b0c

use instr_ptr in _PyFrame_IsIncomplete

1ceeba1

use instr_ptr in LOAD_IP

371fa66

use intr_ptr in INSTRUMENTED_RESUME

557f36f

iritkatriel force-pushed theinstr_ptr branch from2cfbdbf to557f36fCompare

September 11, 2023 10:31

iritkatriel added7 commits

September 11, 2023 13:26

Python/optimizer.c

cb22365

Merge remote-tracking branch 'upstream/main' into instr_ptr

9875704

tweaks

aea21a6

Merge remote-tracking branch 'upstream/main' into instr_ptr

b2221d1

skip test_long_loop for now

7078fe5

added harness for LASTI migration, but no functional change yet

3ac7cc6

WIP

5a672a4

gvanrossum reviewed

Oct 25, 2023

View reviewed changes

Python/optimizer.c OutdatedShow resolvedHide resolved

address (most of) Guido's comments

0b68e54

gvanrossum reviewed

Oct 25, 2023

View reviewed changes

Python/ceval.c OutdatedShow resolvedHide resolved

Copy link

Member

gvanrossum commentedOct 25, 2023

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.

Copy link

Member

gvanrossum commentedOct 25, 2023

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

iritkatriel added3 commits

October 25, 2023 23:44

LOAD_IP takes the offset

96a996c

no need to zero return_offset

8574469

remove OPARG_SET_IP

855513a

Copy link

MemberAuthor

iritkatriel commentedOct 25, 2023

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.