Skip to content

GH-118095: Handle RETURN_GENERATOR in tier 2 #118180

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

Merged
markshannon merged 10 commits into from
Apr 25, 2024
Merged

GH-118095: Handle RETURN_GENERATOR in tier 2 #118180

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fad1c67
Handle RETURN_GENERATOR in tier 2
markshannon Apr 23, 2024
36dd564
Remove an assert that is only valid in tier 1
markshannon Apr 23, 2024
5489713
Fix frame_setlineno to account for change stack effect.
markshannon Apr 23, 2024
5fff5e5
Allow JIT to find _Py_MakeCoro.
markshannon Apr 24, 2024
e1da7df
Make _PyFrame_Copy inline for the JIT
markshannon Apr 24, 2024
4e6e7da
Allow JIT to find _PyThreadState_PopFrame.
markshannon Apr 24, 2024
a2abc7e
Merge branch 'main' into return-gen-tier-2
markshannon Apr 24, 2024
b92c34a
Avoid memcpy in bytecodes.c
markshannon Apr 24, 2024
b97b512
Add test
markshannon Apr 24, 2024
7d7da0c
Address review comment
markshannon Apr 25, 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
Make _PyFrame_Copy inline for the JIT
  • Loading branch information
@markshannon
markshannon committed Apr 24, 2024
commit e1da7dfd5584aab0d7c56284ff19812d97ec7675
10 changes: 9 additions & 1 deletion Include/internal/pycore_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,15 @@ _PyFrame_NumSlotsForCodeObject(PyCodeObject *code)
return code->co_framesize - FRAME_SPECIALS_SIZE;
}

void _PyFrame_Copy(_PyInterpreterFrame *src, _PyInterpreterFrame *dest);
static inline void _PyFrame_Copy(_PyInterpreterFrame *src, _PyInterpreterFrame *dest)
{
assert(src->stacktop >= _PyFrame_GetCode(src)->co_nlocalsplus);
Py_ssize_t size = ((char*)&src->localsplus[src->stacktop]) - (char *)src;
memcpy(dest, src, size);
// Don't leave a dangling pointer to the old frame when creating generators
// and coroutines:
dest->previous = NULL;
}

/* Consumes reference to func and locals.
Does not initialize frame->previous, which happens
Expand Down
12 changes: 0 additions & 12 deletions Python/frame.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,6 @@ _PyFrame_MakeAndSetFrameObject(_PyInterpreterFrame *frame)
return f;
}

void
_PyFrame_Copy(_PyInterpreterFrame *src, _PyInterpreterFrame *dest)
{
assert(src->stacktop >= _PyFrame_GetCode(src)->co_nlocalsplus);
Py_ssize_t size = ((char*)&src->localsplus[src->stacktop]) - (char *)src;
memcpy(dest, src, size);
// Don't leave a dangling pointer to the old frame when creating generators
// and coroutines:
dest->previous = NULL;
}


static void
take_ownership(PyFrameObject *f, _PyInterpreterFrame *frame)
{
Expand Down