Skip to content

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.

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 4 commits into from
Apr 29, 2025
+376 −194
Merged

gh-87859: Track Code Object Local Kinds For Arguments #132980

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ffdc1b
Track code object local kinds for arguments.
ericsnowcurrently Apr 25, 2025
77255be
Merge branch 'main' into track-arg-local-kinds
ericsnowcurrently Apr 28, 2025
6d22d3b
Avoid allocating temporary memory.
ericsnowcurrently Apr 28, 2025
144b98d
Add tests.
ericsnowcurrently Apr 28, 2025
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
14 changes: 8 additions & 6 deletions Include/internal/pycore_code.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,14 @@ typedef struct {
*/

// Note that these all fit within a byte, as do combinations.
// Later, we will use the smaller numbers to differentiate the different
// kinds of locals (e.g. pos-only arg, varkwargs, local-only).
#define CO_FAST_HIDDEN 0x10
#define CO_FAST_LOCAL 0x20
#define CO_FAST_CELL 0x40
#define CO_FAST_FREE 0x80
#define CO_FAST_ARG_POS (0x02) // pos-only, pos-or-kw, varargs
#define CO_FAST_ARG_KW (0x04) // kw-only, pos-or-kw, varkwargs
#define CO_FAST_ARG_VAR (0x08) // varargs, varkwargs
#define CO_FAST_ARG (CO_FAST_ARG_POS | CO_FAST_ARG_KW | CO_FAST_ARG_VAR)
#define CO_FAST_HIDDEN (0x10)
#define CO_FAST_LOCAL (0x20)
#define CO_FAST_CELL (0x40)
#define CO_FAST_FREE (0x80)

typedef unsigned char _PyLocals_Kind;

Expand Down
65 changes: 54 additions & 11 deletions Python/assemble.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,28 +482,62 @@ extern void _Py_set_localsplus_info(int, PyObject *, unsigned char,

static int
compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus,
PyObject *names, PyObject *kinds)
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;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to move this new code to after kinds was calculated, and then you don't need to allocate the argkinds array (just modify the kinds array)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I can make that work without slowing things down.

Copy link
Member Author

Choose a reason for hiding this comment

The 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()) {
return ERROR;
goto error;
}
assert(offset >= 0);
assert(offset < nlocalsplus);

// For now we do not distinguish arg kinds.
_PyLocals_Kind kind = CO_FAST_LOCAL;
_PyLocals_Kind kind = CO_FAST_LOCAL | argkinds[offset];

int has_key = PyDict_Contains(umd->u_fasthidden, k);
RETURN_IF_ERROR(has_key);
if (has_key < 0) {
goto error;
}
if (has_key) {
kind |= CO_FAST_HIDDEN;
}

has_key = PyDict_Contains(umd->u_cellvars, k);
RETURN_IF_ERROR(has_key);
if (has_key < 0) {
goto error;
}
if (has_key) {
kind |= CO_FAST_CELL;
}
Expand All @@ -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);
RETURN_IF_ERROR(has_name);
if (has_name < 0) {
goto error;
}
if (has_name) {
// Skip cells that are already covered by locals.
numdropped += 1;
Expand All @@ -526,7 +562,7 @@ compute_localsplus_info(_PyCompile_CodeUnitMetadata *umd, int nlocalsplus,

cellvar_offset = PyLong_AsInt(v);
if (cellvar_offset == -1 && PyErr_Occurred()) {
return ERROR;
goto error;
}
assert(cellvar_offset >= 0);
cellvar_offset += nlocals - numdropped;
Expand All @@ -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()) {
return ERROR;
goto error;
}
assert(offset >= 0);
offset += nlocals - numdropped;
Expand All @@ -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 *
Expand Down Expand Up @@ -594,8 +635,10 @@ makecode(_PyCompile_CodeUnitMetadata *umd, struct assembler *a, PyObject *const_
if (localspluskinds == NULL) {
goto error;
}
if (compute_localsplus_info(umd, nlocalsplus,
localsplusnames, localspluskinds) == ERROR) {
if (compute_localsplus_info(
umd, nlocalsplus, code_flags,
localsplusnames, localspluskinds) == ERROR)
{
goto error;
}

Expand Down
Loading