8000 GH-96421: Insert shim frame on entry to interpreter by markshannon · Pull Request #96319 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-964 8000 21: Insert shim frame on entry to interpreter #96319

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
merged 39 commits into from
Nov 10, 2022
Merged

GH-96421: Insert shim frame on entry to interpreter #96319

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
4d5e9a5
Handle _PyEval_EvalFrameDefault exit in bytecode.
markshannon Aug 24, 2022
cf78d2b
Merge branch 'main' into entry-frame
markshannon Aug 25, 2022
7f5348a
Get entry frame shim working.
markshannon Aug 26, 2022
59e7727
Delay destruction of trampoline code object and make symbol private
markshannon Aug 30, 2022
9f710e6
Make sure that previous never points into the C stack after return.
markshannon Aug 30, 2022
4ee84ab
Use explicit stacksize in _Py_MakeTrampoline. Allow interpreter to cl…
markshannon Aug 30, 2022
f5161e3
Move assert before use.
markshannon Aug 31, 2022
06c2ad6
Use typedef name.
markshannon Aug 31, 2022
cb6134e
Merge branch 'main' into entry-frame
markshannon Sep 5, 2022
11b3b17
Merge branch 'main' into entry-frame
markshannon Sep 7, 2022
053f488
More on-stack C structs into a big struct and add sentinels, as we wa…
markshannon Sep 8, 2022
4dad69a
Skip a test if ASAN is turned on.
markshannon Sep 8, 2022
0db3b25
Remove extra semicolons.
markshannon Sep 9, 2022
05b4f68
Add news
markshannon Sep 9, 2022
6cca61c
Merge branch 'main' into entry-frame
markshannon Sep 9, 2022
5099861
Merge branch 'main' into entry-frame
markshannon Sep 13, 2022
4015c72
Halve the number of writes for shim frame.
markshannon Sep 14, 2022
8000
fb19e94
Remove one more write to shim frame.
markshannon Sep 14, 2022
95ef81b
Fix lltrace
markshannon Sep 14, 2022
972425d
Merge branch 'main' into entry-frame
markshannon Oct 19, 2022
aa8bd73
Remove first_instr local variable.
markshannon Oct 19, 2022
f7072e1
Add news and update frame_layout.md
markshannon Oct 19, 2022
52406d2
Merge branch 'main' into entry-frame
markshannon Oct 19, 2022
bd2b0ee
Remove debugging scaffolding and give C compiler more freedom to layo…
markshannon Oct 20, 2022
10b03c8
Remove typo
markshannon Oct 20, 2022
b62f5f3
Address code review comments.
markshannon Oct 21, 2022
1a0b08f
Generate linetable when creating shim code.
markshannon Oct 21, 2022
76e437a
Bundle shim code definition into single struct.
markshannon Oct 21, 2022
945e26a
Remove incorrect assert.
markshannon Oct 21, 2022
676321a
assert generator is cleared after returning or raising.
markshannon Oct 21, 2022
3cb22e6
Rename pyframe to entry_frame.
markshannon Oct 21, 2022
e5dcbd9
Pass correct length.
markshannon Oct 21, 2022
bd29356
Address review comments
markshannon Nov 7, 2022
9446325
Merge branch 'main' into entry-frame
markshannon Nov 7, 2022
f6a6457
Post merge cleanup
markshannon Nov 8, 2022
d113655
Turn ASAN back on for subprocess test.
markshannon Nov 8, 2022
ed7af1e
Apply suggestions from code review
markshannon Nov 9, 2022
48410d9
Merge branch 'main' into entry-frame
markshannon Nov 9, 2022
7cda3ef
Merge branch 'main' into entry-frame
markshannon Nov 10, 2022
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
Delay destruction of trampoline code object and make symbol private
  • Loading branch information
@markshannon
markshannon committed Aug 30, 2022
commit 59e7727565d4ff44f97f24061faf99ab0a4021b3
1 change: 1 addition & 0 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
py_frame.f_locals = NULL;
py_frame.frame_obj = NULL;
py_frame.f_code = tstate->interp->interpreter_trampoline;
assert(tstate->interp->interpreter_trampoline != NULL);
py_frame.prev_instr = _PyCode_CODE(tstate->interp->interpreter_trampoline);
py_frame.stacktop = 0;
py_frame.owner = FRAME_OWNED_BY_CSTACK;
Expand Down
2 changes: 1 addition & 1 deletion Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ pycore_init_types(PyInterpreterState *interp)
return _PyStatus_OK();
}

const char INTERPRETER_TRAMPOLINE_CODE[] = {
static const char INTERPRETER_TRAMPOLINE_CODE[] = {
0, 0,
INTERPRETER_EXIT, 0,
RESUME, 0
Expand Down
2 changes: 1 addition & 1 deletion Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,6 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
Py_CLEAR(interp->importlib);
Py_CLEAR(interp->import_func);
Py_CLEAR(interp->dict);
Py_CLEAR(interp->interpreter_trampoline);
#ifdef HAVE_FORK
Py_CLEAR(interp->before_forkers);
Py_CLEAR(interp->after_forkers_parent);
Expand All @@ -451,6 +450,7 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
PyDict_Clear(interp->builtins);
Py_CLEAR(interp->sysdict);
Py_CLEAR(interp->builtins);
Py_CLEAR(interp->interpreter_trampoline);

// XXX Once we have one allocator per interpreter (i.e.
// per-interpreter GC) we must ensure that all of the interpreter's
Expand Down
0