mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-88696: clean up dead argument to compiler_make_closure (GH-100806)

Browse source
This commit is contained in:
Carl Meyer 2023-01-07 05:20:48 -07:00 • committed by GitHub
parent 9e7d7266ec
commit 7116030a25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Python/compile.c
View file

@ -2246,11 +2246,8 @@ compiler_lookup_arg(PyObject *dict, PyObject *name)
static int static int
compiler_make_closure(struct compiler *c, location loc, compiler_make_closure(struct compiler *c, location loc,
PyCodeObject *co, Py_ssize_t flags, PyObject *qualname) PyCodeObject *co, Py_ssize_t flags)
{ {
if (qualname == NULL)
qualname = co->co_name;
if (co->co_nfreevars) { if (co->co_nfreevars) {
int i = PyCode_GetFirstFree(co); int i = PyCode_GetFirstFree(co);
for (; i < co->co_nlocalsplus; ++i) { for (; i < co->co_nlocalsplus; ++i) {
@ -2605,7 +2602,7 @@ static int
compiler_function(struct compiler *c, stmt_ty s, int is_async) compiler_function(struct compiler *c, stmt_ty s, int is_async)
{ {
PyCodeObject *co; PyCodeObject *co;
PyObject *qualname, *docstring = NULL; PyObject *docstring = NULL;
arguments_ty args; arguments_ty args;
expr_ty returns; expr_ty returns;
identifier name; identifier name;
@ -2682,19 +2679,15 @@ compiler_function(struct compiler *c, stmt_ty s, int is_async)
} }
} }
co = assemble(c, 1); co = assemble(c, 1);
qualname = Py_NewRef(c->u->u_qualname);
compiler_exit_scope(c); compiler_exit_scope(c);
if (co == NULL) { if (co == NULL) {
Py_XDECREF(qualname);
Py_XDECREF(co); Py_XDECREF(co);
return ERROR; return ERROR;
} }
if (compiler_make_closure(c, loc, co, funcflags, qualname) < 0) { if (compiler_make_closure(c, loc, co, funcflags) < 0) {
Py_DECREF(qualname);
Py_DECREF(co); Py_DECREF(co);
return ERROR; return ERROR;
} }
Py_DECREF(qualname);
Py_DECREF(co); Py_DECREF(co);
RETURN_IF_ERROR(compiler_apply_decorators(c, decos)); RETURN_IF_ERROR(compiler_apply_decorators(c, decos));
@ -2794,7 +2787,7 @@ compiler_class(struct compiler *c, stmt_ty s)
ADDOP(c, loc, LOAD_BUILD_CLASS); ADDOP(c, loc, LOAD_BUILD_CLASS);
/* 3. load a function (or closure) made from the code object */ /* 3. load a function (or closure) made from the code object */
if (compiler_make_closure(c, loc, co, 0, NULL) < 0) { if (compiler_make_closure(c, loc, co, 0) < 0) {
Py_DECREF(co); Py_DECREF(co);
return ERROR; return ERROR;
} }
@ -3015,7 +3008,6 @@ static int
compiler_lambda(struct compiler *c, expr_ty e) compiler_lambda(struct compiler *c, expr_ty e)
{ {
PyCodeObject *co; PyCodeObject *co;
PyObject *qualname;
Py_ssize_t funcflags; Py_ssize_t funcflags;
arguments_ty args = e->v.Lambda.args; arguments_ty args = e->v.Lambda.args;
assert(e->kind == Lambda_kind); assert(e->kind == Lambda_kind);
@ -3049,19 +3041,15 @@ compiler_lambda(struct compiler *c, expr_ty e)
ADDOP_IN_SCOPE(c, loc, RETURN_VALUE); ADDOP_IN_SCOPE(c, loc, RETURN_VALUE);
co = assemble(c, 1); co = assemble(c, 1);
} }
qualname = Py_NewRef(c->u->u_qualname);
compiler_exit_scope(c); compiler_exit_scope(c);
if (co == NULL) { if (co == NULL) {
Py_DECREF(qualname);
return ERROR; return ERROR;
} }
if (compiler_make_closure(c, loc, co, funcflags, qualname) < 0) { if (compiler_make_closure(c, loc, co, funcflags) < 0) {
Py_DECREF(qualname);
Py_DECREF(co); Py_DECREF(co);
return ERROR; return ERROR;
} }
Py_DECREF(qualname);
Py_DECREF(co); Py_DECREF(co);
return SUCCESS; return SUCCESS;
@ -5392,7 +5380,6 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
{ {
PyCodeObject *co = NULL; PyCodeObject *co = NULL;
comprehension_ty outermost; comprehension_ty outermost;
PyObject *qualname = NULL;
int scope_type = c->u->u_scope_type; int scope_type = c->u->u_scope_type;
int is_async_generator = 0; int is_async_generator = 0;
int is_top_level_await = IS_TOP_LEVEL_AWAIT(c); int is_top_level_await = IS_TOP_LEVEL_AWAIT(c);
@ -5453,7 +5440,6 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
} }
co = assemble(c, 1); co = assemble(c, 1);
qualname = Py_NewRef(c->u->u_qualname);
compiler_exit_scope(c); compiler_exit_scope(c);
if (is_top_level_await && is_async_generator){ if (is_top_level_await && is_async_generator){
c->u->u_ste->ste_coroutine = 1; c->u->u_ste->ste_coroutine = 1;
@ -5463,10 +5449,9 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
} }
loc = LOC(e); loc = LOC(e);
if (compiler_make_closure(c, loc, co, 0, qualname) < 0) { if (compiler_make_closure(c, loc, co, 0) < 0) {
goto error; goto error;
} }
Py_DECREF(qualname);
Py_DECREF(co); Py_DECREF(co);
VISIT(c, expr, outermost->iter); VISIT(c, expr, outermost->iter);
@ -5490,7 +5475,6 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
error_in_scope: error_in_scope:
compiler_exit_scope(c); compiler_exit_scope(c);
error: error:
Py_XDECREF(qualname);
Py_XDECREF(co); Py_XDECREF(co);
return ERROR; return ERROR;
} }
@ -8671,7 +8655,7 @@ opcode_metadata_is_sane(cfg_builder *g) {
for (int i = 0; i < b->b_iused; i++) { for (int i = 0; i < b->b_iused; i++) {
struct instr *instr = &b->b_instr[i]; struct instr *instr = &b->b_instr[i];
int opcode = instr->i_opcode; int opcode = instr->i_opcode;
assert(opcode <= MAX_REAL_OPCODE); assert(opcode <= MAX_REAL_OPCODE);
int pushed = _PyOpcode_opcode_metadata[opcode].n_pushed; int pushed = _PyOpcode_opcode_metadata[opcode].n_pushed;
int popped = _PyOpcode_opcode_metadata[opcode].n_popped; int popped = _PyOpcode_opcode_metadata[opcode].n_popped;
assert((pushed < 0) == (popped < 0)); assert((pushed < 0) == (popped < 0));