Skip to content

bpo-43693: Clean up the PyCodeObject fields. #26364

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 7 commits into from
May 26, 2021
Merged

bpo-43693: Clean up the PyCodeObject fields. #26364

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ff6c47
Move up the comment about fields using in hashing/comparision.
ericsnowcurrently May 25, 2021
c5aa5ee
Group the fields more clearly.
ericsnowcurrently May 25, 2021
9a62e10
Add co_ncellvars and co_nfreevars.
ericsnowcurrently May 25, 2021
e48f0f0
Use nlocals.
ericsnowcurrently May 25, 2021
da9618b
Clarify a comment.
ericsnowcurrently May 25, 2021
ca08205
Raise ValueError if nlocals != len(varnames), rather than aborting.
ericsnowcurrently May 26, 2021
9279114
Add a unit test for when co_nlocals != len(co_varnames).
ericsnowcurrently May 26, 2021
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
Group the fields more clearly.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 25, 2021
commit c5aa5eed1accb0b2da59e72f5c059a6bc6a7316a
25 changes: 18 additions & 7 deletions Include/cpython/code.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,37 @@ struct PyCodeObject {
* identical functions/lambdas defined on different lines.
*/

/* These fields are set with provided values on new code objects. */

// The hottest fields (in the eval loop) are grouped here at the top.
PyObject *co_code; /* instruction opcodes */
PyObject *co_consts; /* list (constants used) */
PyObject *co_names; /* list of strings (names used) */
int co_flags; /* CO_..., see below */
// The rest are not so impactful on performance.
int co_argcount; /* #arguments, except *args */
int co_posonlyargcount; /* #positional only arguments */
int co_kwonlyargcount; /* #keyword only arguments */
int co_nlocals; /* #local variables */
int co_stacksize; /* #entries needed for evaluation stack */
int co_flags; /* CO_..., see below */
int co_firstlineno; /* first source line number */
PyObject *co_code; /* instruction opcodes */
PyObject *co_consts; /* list (constants used) */
PyObject *co_names; /* list of strings (names used) */
PyObject *co_varnames; /* tuple of strings (local variable names) */
PyObject *co_freevars; /* tuple of strings (free variable names) */
PyObject *co_cellvars; /* tuple of strings (cell variable names) */
Py_ssize_t *co_cell2arg; /* Maps cell vars which are arguments. */
PyObject *co_filename; /* unicode (where it was loaded from) */
PyObject *co_name; /* unicode (name, for reference) */
PyObject *co_linetable; /* string (encoding addr<->lineno mapping) See
Objects/lnotab_notes.txt for details. */
int co_nlocalsplus; /* Number of locals + free + cell variables */
PyObject *co_exceptiontable; /* Byte string encoding exception handling table */

/* These fields are set with computed values on new code objects. */

Py_ssize_t *co_cell2arg; /* Maps cell vars which are arguments. */
// These are redundant.
int co_nlocalsplus; /* Number of locals + free + cell variables */
int co_nlocals; /* #local variables */

/* The remaining fields are zeroed out on new code objects. */

PyObject *co_weakreflist; /* to support weakrefs to code objects */
/* Scratch space for extra data relating to the code object.
Type is a void* to keep the format private in codeobject.c to force
Expand Down