Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32.3k
gh-87859: Track Code Object Local Kinds For Arguments#132980
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
Merged
ericsnowcurrently merged 4 commits intopython:mainfromericsnowcurrently:track-arg-local-kindsApr 29, 2025
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
4 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
NextNext commit
Track code object local kinds for arguments.
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit1ffdc1b9df998540664cf7c37a8ffe6c4e1a79b2
There are no files selected for viewing
14 changes: 8 additions & 6 deletionsInclude/internal/pycore_code.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -482,28 +482,62 @@ extern void _Py_set_localsplus_info(int, PyObject *, unsigned char, | ||
| static int | ||
| compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus, | ||
| int flags,PyObject *names, PyObject *kinds) | ||
| { | ||
| // Compute the arg flags. | ||
| // Currently arg vars fill the first portion of the list. | ||
| char *argkinds = PyMem_Calloc(nlocalsplus, sizeof(char)); | ||
| if (argkinds == NULL) { | ||
| PyErr_NoMemory(); | ||
| return ERROR; | ||
| } | ||
| int numargvars = 0; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Would it be possible to move this new code to after There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. I think I can make that work without slowing things down. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. done | ||
| int max = (int)umd->u_posonlyargcount; | ||
| for (; numargvars < max; numargvars++) { | ||
| argkinds[numargvars] = CO_FAST_ARG_POS; | ||
| } | ||
| max += (int)umd->u_argcount; | ||
| for (; numargvars < max; numargvars++) { | ||
| argkinds[numargvars] = CO_FAST_ARG_POS | CO_FAST_ARG_KW; | ||
| } | ||
| max += (int)umd->u_kwonlyargcount; | ||
| for (; numargvars < max; numargvars++) { | ||
| argkinds[numargvars] = CO_FAST_ARG_KW; | ||
| } | ||
| if (flags & CO_VARARGS) { | ||
| argkinds[numargvars] = CO_FAST_ARG_VAR | CO_FAST_ARG_POS; | ||
| numargvars += 1; | ||
| } | ||
| if (flags & CO_VARKEYWORDS) { | ||
| argkinds[numargvars] = CO_FAST_ARG_VAR | CO_FAST_ARG_KW; | ||
| numargvars += 1; | ||
| } | ||
| // Set the locals kinds. | ||
| PyObject *k, *v; | ||
| Py_ssize_t pos = 0; | ||
| while (PyDict_Next(umd->u_varnames, &pos, &k, &v)) { | ||
| int offset = PyLong_AsInt(v); | ||
| if (offset == -1 && PyErr_Occurred()) { | ||
| goto error; | ||
| } | ||
| assert(offset >= 0); | ||
| assert(offset < nlocalsplus); | ||
| _PyLocals_Kind kind = CO_FAST_LOCAL | argkinds[offset]; | ||
| int has_key = PyDict_Contains(umd->u_fasthidden, k); | ||
| if (has_key < 0) { | ||
| goto error; | ||
| } | ||
| if (has_key) { | ||
| kind |= CO_FAST_HIDDEN; | ||
| } | ||
| has_key = PyDict_Contains(umd->u_cellvars, k); | ||
| if (has_key < 0) { | ||
| goto error; | ||
| } | ||
| if (has_key) { | ||
| kind |= CO_FAST_CELL; | ||
| } | ||
| @@ -517,7 +551,9 @@ compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus, | ||
| pos = 0; | ||
| while (PyDict_Next(umd->u_cellvars, &pos, &k, &v)) { | ||
| int has_name = PyDict_Contains(umd->u_varnames, k); | ||
| if (has_name < 0) { | ||
| goto error; | ||
| } | ||
| if (has_name) { | ||
| // Skip cells that are already covered by locals. | ||
| numdropped += 1; | ||
| @@ -526,7 +562,7 @@ compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus, | ||
| cellvar_offset = PyLong_AsInt(v); | ||
| if (cellvar_offset == -1 && PyErr_Occurred()) { | ||
| goto error; | ||
| } | ||
| assert(cellvar_offset >= 0); | ||
| cellvar_offset += nlocals - numdropped; | ||
| @@ -538,7 +574,7 @@ compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus, | ||
| while (PyDict_Next(umd->u_freevars, &pos, &k, &v)) { | ||
| int offset = PyLong_AsInt(v); | ||
| if (offset == -1 && PyErr_Occurred()) { | ||
| goto error; | ||
| } | ||
| assert(offset >= 0); | ||
| offset += nlocals - numdropped; | ||
| @@ -549,7 +585,12 @@ compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus, | ||
| assert(offset > cellvar_offset); | ||
| _Py_set_localsplus_info(offset, k, CO_FAST_FREE, names, kinds); | ||
| } | ||
| PyMem_Free(argkinds); | ||
| return SUCCESS; | ||
| error: | ||
| PyMem_Free(argkinds); | ||
| return ERROR; | ||
| } | ||
| static PyCodeObject * | ||
| @@ -594,8 +635,10 @@ makecode(_PyCompile_CodeUnitMetadata *umd, struct assembler *a, PyObject *const_ | ||
| if (localspluskinds == NULL) { | ||
| goto error; | ||
| } | ||
| if (compute_localsplus_info( | ||
| umd, nlocalsplus, code_flags, | ||
| localsplusnames, localspluskinds) == ERROR) | ||
| { | ||
| goto error; | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.