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
Next Next commit
Move up the comment about fields using in hashing/comparision.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 25, 2021
commit 5ff6c47b5b637cdf60185e5cad12c882a5e9dced
28 changes: 23 additions & 5 deletions Include/cpython/code.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,29 @@ typedef struct _PyOpcache _PyOpcache;
/* Bytecode object */
struct PyCodeObject {
PyObject_HEAD

/* Note only the following fields are used in hash and/or comparisons
*
* - co_name
* - co_argcount
* - co_posonlyargcount
* - co_kwonlyargcount
* - co_nlocals
* - co_stacksize
* - co_flags
* - co_firstlineno
* - co_code
* - co_consts
* - co_names
* - co_varnames
* - co_freevars
* - co_cellvars
*
* This is done to preserve the name and line number for tracebacks
* and debuggers; otherwise, constant de-duplication would collapse
* identical functions/lambdas defined on different lines.
*/

int co_argcount; /* #arguments, except *args */
int co_posonlyargcount; /* #positional only arguments */
int co_kwonlyargcount; /* #keyword only arguments */
Expand All @@ -30,11 +53,6 @@ struct PyCodeObject {
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) */
/* The rest aren't used in either hash or comparisons, except for co_name,
used in both. This is done to preserve the name and line number
for tracebacks and debuggers; otherwise, constant de-duplication
would collapse identical functions/lambdas defined on different lines.
*/
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) */
Expand Down