Skip to content

gh-117045: Add code object to function version cache #117028

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
gvanrossum merged 14 commits into from
Mar 21, 2024
Merged

gh-117045: Add code object to function version cache #117028

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
21dc79c
Leave func_version zero after critical mutations
gvanrossum Mar 18, 2024
51bc626
Change the function version cache to contain a (func, code) pair
gvanrossum Mar 19, 2024
0d5f849
Use _PyFrame_GetCode where needed; tweak a debug print
gvanrossum Mar 19, 2024
b998bf2
Clarify type of f_executable
gvanrossum Mar 19, 2024
fdbfe07
Change the operand for _PUSH_FRAME
gvanrossum Mar 19, 2024
fe149b2
Rewrite explanatory comment
gvanrossum Mar 19, 2024
0d0551e
Add code to the trace stack in translate_bytecode_to_trace()
gvanrossum Mar 19, 2024
b999d3e
Set operand for _PUSH/_POP_FRAME more consistently
gvanrossum Mar 19, 2024
b8141cd
Remove bogus assert
gvanrossum Mar 19, 2024
0fd96be
Document and enforce invariants
gvanrossum Mar 20, 2024
6748a56
Enforce invariant differently
gvanrossum Mar 20, 2024
fac617c
Revert "Remove bogus assert" (it's not my job to fix this)
gvanrossum Mar 20, 2024
37fab3c
Address code review
gvanrossum Mar 20, 2024
f3de0ef
Merge remote-tracking branch 'origin/main' into func-version-cache
gvanrossum Mar 20, 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
Document and enforce invariants
  • Loading branch information
@gvanrossum
gvanrossum committed Mar 20, 2024
commit 0fd96be84aa28ad987f76686139037a6352b06c1
17 changes: 16 additions & 1 deletion Objects/funcobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,18 @@ function object and the code object.

The cache doesn't contain strong references; cache entries are
invalidated whenever the function or code object is deallocated.

Invariants
----------

These should hold at any time except when one of the cache-mutating
functions is running.

- For any slot s at index i:
- s->func == NULL or s->func->func_version % FUNC_VERSION_CACHE_SIZE == i
- s->code == NULL or s->code->co_version % FUNC_VERSION_CACHE_SIZE == i
if s->func != NULL, then s->func->func_code == s->code

*/

void
Expand Down Expand Up @@ -297,7 +309,10 @@ _PyFunction_ClearCodeByVersion(uint32_t version)
assert(PyCode_Check(slot->code));
PyCodeObject *code = (PyCodeObject *)slot->code;
if (code->co_version == version) {
slot->code = NULL;
slot->code = NULL;
if (slot->func != NULL) {
slot->code = slot->func->func_code;
}
}
}
}
Expand Down