bpo-33298: Wrap only constants with _PyCode_ConstantKey() in the compiler. (GH-6512)
diff --git a/Python/compile.c b/Python/compile.c
index 6053db2..5f5e653 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -171,7 +171,6 @@
static basicblock *compiler_new_block(struct compiler *);
static int compiler_next_instr(struct compiler *, basicblock *);
static int compiler_addop(struct compiler *, int);
-static int compiler_addop_o(struct compiler *, int, PyObject *, PyObject *);
static int compiler_addop_i(struct compiler *, int, Py_ssize_t);
static int compiler_addop_j(struct compiler *, int, basicblock *, int);
static int compiler_error(struct compiler *, const char *);
@@ -407,14 +406,11 @@
return NULL;
}
k = PyList_GET_ITEM(list, i);
- k = _PyCode_ConstantKey(k);
- if (k == NULL || PyDict_SetItem(dict, k, v) < 0) {
- Py_XDECREF(k);
+ if (PyDict_SetItem(dict, k, v) < 0) {
Py_DECREF(v);
Py_DECREF(dict);
return NULL;
}
- Py_DECREF(k);
Py_DECREF(v);
}
return dict;
@@ -463,23 +459,20 @@
scope = (vi >> SCOPE_OFFSET) & SCOPE_MASK;
if (scope == scope_type || vi & flag) {
- PyObject *tuple, *item = PyLong_FromSsize_t(i);
+ PyObject *item = PyLong_FromSsize_t(i);
if (item == NULL) {
Py_DECREF(sorted_keys);
Py_DECREF(dest);
return NULL;
}
i++;
- tuple = _PyCode_ConstantKey(k);
- if (!tuple || PyDict_SetItem(dest, tuple, item) < 0) {
+ if (PyDict_SetItem(dest, k, item) < 0) {
Py_DECREF(sorted_keys);
Py_DECREF(item);
Py_DECREF(dest);
- Py_XDECREF(tuple);
return NULL;
}
Py_DECREF(item);
- Py_DECREF(tuple);
}
}
Py_DECREF(sorted_keys);
@@ -565,7 +558,7 @@
if (u->u_ste->ste_needs_class_closure) {
/* Cook up an implicit __class__ cell. */
_Py_IDENTIFIER(__class__);
- PyObject *tuple, *name;
+ PyObject *name;
int res;
assert(u->u_scope_type == COMPILER_SCOPE_CLASS);
assert(PyDict_GET_SIZE(u->u_cellvars) == 0);
@@ -574,13 +567,7 @@
compiler_unit_free(u);
return 0;
}
- tuple = _PyCode_ConstantKey(name);
- if (!tuple) {
- compiler_unit_free(u);
- return 0;
- }
- res = PyDict_SetItem(u->u_cellvars, tuple, _PyLong_Zero);
- Py_DECREF(tuple);
+ res = PyDict_SetItem(u->u_cellvars, name, _PyLong_Zero);
if (res < 0) {
compiler_unit_free(u);
return 0;
@@ -1158,27 +1145,20 @@
static Py_ssize_t
compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
{
- PyObject *t, *v;
+ PyObject *v;
Py_ssize_t arg;
- t = _PyCode_ConstantKey(o);
- if (t == NULL)
- return -1;
-
- v = PyDict_GetItem(dict, t);
+ v = PyDict_GetItemWithError(dict, o);
if (!v) {
if (PyErr_Occurred()) {
- Py_DECREF(t);
return -1;
}
arg = PyDict_GET_SIZE(dict);
v = PyLong_FromSsize_t(arg);
if (!v) {
- Py_DECREF(t);
return -1;
}
- if (PyDict_SetItem(dict, t, v) < 0) {
- Py_DECREF(t);
+ if (PyDict_SetItem(dict, o, v) < 0) {
Py_DECREF(v);
return -1;
}
@@ -1186,11 +1166,34 @@
}
else
arg = PyLong_AsLong(v);
+ return arg;
+}
+
+static Py_ssize_t
+compiler_add_const(struct compiler *c, PyObject *o)
+{
+ PyObject *t;
+ Py_ssize_t arg;
+
+ t = _PyCode_ConstantKey(o);
+ if (t == NULL)
+ return -1;
+
+ arg = compiler_add_o(c, c->u->u_consts, t);
Py_DECREF(t);
return arg;
}
static int
+compiler_addop_load_const(struct compiler *c, PyObject *o)
+{
+ Py_ssize_t arg = compiler_add_const(c, o);
+ if (arg < 0)
+ return 0;
+ return compiler_addop_i(c, LOAD_CONST, arg);
+}
+
+static int
compiler_addop_o(struct compiler *c, int opcode, PyObject *dict,
PyObject *o)
{
@@ -1290,6 +1293,24 @@
} \
}
+#define ADDOP_LOAD_CONST(C, O) { \
+ if (!compiler_addop_load_const((C), (O))) \
+ return 0; \
+}
+
+/* Same as ADDOP_LOAD_CONST, but steals a reference. */
+#define ADDOP_LOAD_CONST_NEW(C, O) { \
+ PyObject *__new_const = (O); \
+ if (__new_const == NULL) { \
+ return 0; \
+ } \
+ if (!compiler_addop_load_const((C), __new_const)) { \
+ Py_DECREF(__new_const); \
+ return 0; \
+ } \
+ Py_DECREF(__new_const); \
+}
+
#define ADDOP_O(C, OP, O, TYPE) { \
if (!compiler_addop_o((C), (OP), (C)->u->u_ ## TYPE, (O))) \
return 0; \
@@ -1534,7 +1555,7 @@
ADDOP(c, WITH_CLEANUP_START);
if (info->fb_type == ASYNC_WITH) {
ADDOP(c, GET_AWAITABLE);
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
ADDOP(c, YIELD_FROM);
}
ADDOP(c, WITH_CLEANUP_FINISH);
@@ -1579,7 +1600,7 @@
}
/* if not -OO mode, set docstring */
if (c->c_optimize < 2 && docstring) {
- ADDOP_O(c, LOAD_CONST, docstring, consts);
+ ADDOP_LOAD_CONST(c, docstring);
ADDOP_NAME(c, STORE_NAME, __doc__, names);
}
VISIT_SEQ(c, stmt, stmts);
@@ -1668,12 +1689,8 @@
static int
compiler_lookup_arg(PyObject *dict, PyObject *name)
{
- PyObject *k, *v;
- k = _PyCode_ConstantKey(name);
- if (k == NULL)
- return -1;
- v = PyDict_GetItem(dict, k);
- Py_DECREF(k);
+ PyObject *v;
+ v = PyDict_GetItem(dict, name);
if (v == NULL)
return -1;
return PyLong_AS_LONG(v);
@@ -1721,8 +1738,8 @@
flags |= 0x08;
ADDOP_I(c, BUILD_TUPLE, free);
}
- ADDOP_O(c, LOAD_CONST, (PyObject*)co, consts);
- ADDOP_O(c, LOAD_CONST, qualname, consts);
+ ADDOP_LOAD_CONST(c, (PyObject*)co);
+ ADDOP_LOAD_CONST(c, qualname);
ADDOP_I(c, MAKE_FUNCTION, flags);
return 1;
}
@@ -1784,10 +1801,7 @@
Py_ssize_t default_count = PyList_GET_SIZE(keys);
PyObject *keys_tuple = PyList_AsTuple(keys);
Py_DECREF(keys);
- if (keys_tuple == NULL) {
- return 0;
- }
- ADDOP_N(c, LOAD_CONST, keys_tuple, consts);
+ ADDOP_LOAD_CONST_NEW(c, keys_tuple);
ADDOP_I(c, BUILD_CONST_KEY_MAP, default_count);
assert(default_count > 0);
return 1;
@@ -1804,12 +1818,7 @@
static int
compiler_visit_annexpr(struct compiler *c, expr_ty annotation)
{
- PyObject *ann_as_str;
- ann_as_str = _PyAST_ExprAsUnicode(annotation, 1);
- if (!ann_as_str) {
- return 0;
- }
- ADDOP_N(c, LOAD_CONST, ann_as_str, consts);
+ ADDOP_LOAD_CONST_NEW(c, _PyAST_ExprAsUnicode(annotation, 1));
return 1;
}
@@ -1896,10 +1905,7 @@
if (len) {
PyObject *keytuple = PyList_AsTuple(names);
Py_DECREF(names);
- if (keytuple == NULL) {
- return 0;
- }
- ADDOP_N(c, LOAD_CONST, keytuple, consts);
+ ADDOP_LOAD_CONST_NEW(c, keytuple);
ADDOP_I(c, BUILD_CONST_KEY_MAP, len);
return 1;
}
@@ -2002,7 +2008,7 @@
/* if not -OO mode, add docstring */
if (c->c_optimize < 2 && s->v.FunctionDef.docstring)
docstring = s->v.FunctionDef.docstring;
- if (compiler_add_o(c, c->u->u_consts, docstring) < 0) {
+ if (compiler_add_const(c, docstring) < 0) {
compiler_exit_scope(c);
return 0;
}
@@ -2082,7 +2088,7 @@
}
Py_DECREF(str);
assert(c->u->u_qualname);
- ADDOP_O(c, LOAD_CONST, c->u->u_qualname, consts);
+ ADDOP_LOAD_CONST(c, c->u->u_qualname);
str = PyUnicode_InternFromString("__qualname__");
if (!str || !compiler_nameop(c, str, Store)) {
Py_XDECREF(str);
@@ -2124,7 +2130,7 @@
else {
/* No methods referenced __class__, so just return None */
assert(PyDict_GET_SIZE(c->u->u_cellvars) == 0);
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
}
ADDOP_IN_SCOPE(c, RETURN_VALUE);
/* create the code object */
@@ -2143,7 +2149,7 @@
Py_DECREF(co);
/* 4. load class name */
- ADDOP_O(c, LOAD_CONST, s->v.ClassDef.name, consts);
+ ADDOP_LOAD_CONST(c, s->v.ClassDef.name);
/* 5. generate the rest of the code for the call */
if (!compiler_call_helper(c, 2,
@@ -2336,7 +2342,7 @@
/* Make None the first constant, so the lambda can't have a
docstring. */
- if (compiler_add_o(c, c->u->u_consts, Py_None) < 0)
+ if (compiler_add_const(c, Py_None) < 0)
return 0;
c->u->u_argcount = asdl_seq_LEN(args->args);
@@ -2454,7 +2460,7 @@
/* SETUP_FINALLY to guard the __anext__ call */
ADDOP_JREL(c, SETUP_FINALLY, except);
ADDOP(c, GET_ANEXT);
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
ADDOP(c, YIELD_FROM);
ADDOP(c, POP_BLOCK); /* for SETUP_FINALLY */
@@ -2553,7 +2559,7 @@
return 0;
}
if (s->v.Return.value == NULL) {
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
}
else if (!preserve_tos) {
VISIT(c, expr, s->v.Return.value);
@@ -2776,7 +2782,7 @@
return 0;
/* name = None; del name */
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
compiler_nameop(c, handler->v.ExceptHandler.name, Store);
compiler_nameop(c, handler->v.ExceptHandler.name, Del);
@@ -2875,8 +2881,8 @@
alias_ty alias = (alias_ty)asdl_seq_GET(s->v.Import.names, i);
int r;
- ADDOP_O(c, LOAD_CONST, _PyLong_Zero, consts);
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, _PyLong_Zero);
+ ADDOP_LOAD_CONST(c, Py_None);
ADDOP_NAME(c, IMPORT_NAME, alias->name, names);
if (alias->asname) {
@@ -2908,7 +2914,7 @@
compiler_from_import(struct compiler *c, stmt_ty s)
{
Py_ssize_t i, n = asdl_seq_LEN(s->v.ImportFrom.names);
- PyObject *level, *names;
+ PyObject *names;
static PyObject *empty_string;
if (!empty_string) {
@@ -2917,11 +2923,7 @@
return 0;
}
- level = PyLong_FromLong(s->v.ImportFrom.level);
- if (!level) {
- return 0;
- }
- ADDOP_N(c, LOAD_CONST, level, consts);
+ ADDOP_LOAD_CONST_NEW(c, PyLong_FromLong(s->v.ImportFrom.level));
names = PyTuple_New(n);
if (!names)
@@ -2940,7 +2942,7 @@
return compiler_error(c, "from __future__ imports must occur "
"at the beginning of the file");
}
- ADDOP_N(c, LOAD_CONST, names, consts);
+ ADDOP_LOAD_CONST_NEW(c, names);
if (s->v.ImportFrom.module) {
ADDOP_NAME(c, IMPORT_NAME, s->v.ImportFrom.module, names);
@@ -3496,7 +3498,7 @@
Py_INCREF(key);
PyTuple_SET_ITEM(keys, i - begin, key);
}
- ADDOP_N(c, LOAD_CONST, keys, consts);
+ ADDOP_LOAD_CONST_NEW(c, keys);
ADDOP_I(c, BUILD_CONST_KEY_MAP, n);
}
else {
@@ -3706,14 +3708,14 @@
Py_INCREF(key);
PyTuple_SET_ITEM(keys, i - begin, key);
}
- ADDOP_N(c, LOAD_CONST, keys, consts);
+ ADDOP_LOAD_CONST_NEW(c, keys);
ADDOP_I(c, BUILD_CONST_KEY_MAP, n);
}
else {
/* a for loop only executes once */
for (i = begin; i < end; i++) {
kw = asdl_seq_GET(keywords, i);
- ADDOP_O(c, LOAD_CONST, kw->arg, consts);
+ ADDOP_LOAD_CONST(c, kw->arg);
VISIT(c, expr, kw->value);
}
ADDOP_I(c, BUILD_MAP, n);
@@ -3823,7 +3825,7 @@
Py_INCREF(kw->arg);
PyTuple_SET_ITEM(names, i, kw->arg);
}
- ADDOP_N(c, LOAD_CONST, names, consts);
+ ADDOP_LOAD_CONST_NEW(c, names);
ADDOP_I(c, CALL_FUNCTION_KW, n + nelts + nkwelts);
return 1;
}
@@ -3987,7 +3989,7 @@
ADDOP_JREL(c, SETUP_FINALLY, except);
ADDOP(c, GET_ANEXT);
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
ADDOP(c, YIELD_FROM);
ADDOP(c, POP_BLOCK);
VISIT(c, expr, gen->target);
@@ -4127,7 +4129,7 @@
if (is_async_generator && type != COMP_GENEXP) {
ADDOP(c, GET_AWAITABLE);
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
ADDOP(c, YIELD_FROM);
}
@@ -4267,7 +4269,7 @@
ADDOP(c, BEFORE_ASYNC_WITH);
ADDOP(c, GET_AWAITABLE);
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
ADDOP(c, YIELD_FROM);
ADDOP_JREL(c, SETUP_ASYNC_WITH, finally);
@@ -4308,7 +4310,7 @@
ADDOP(c, WITH_CLEANUP_START);
ADDOP(c, GET_AWAITABLE);
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
ADDOP(c, YIELD_FROM);
ADDOP(c, WITH_CLEANUP_FINISH);
@@ -4449,7 +4451,7 @@
VISIT(c, expr, e->v.Yield.value);
}
else {
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
}
ADDOP(c, YIELD_VALUE);
break;
@@ -4462,7 +4464,7 @@
VISIT(c, expr, e->v.YieldFrom.value);
ADDOP(c, GET_YIELD_FROM_ITER);
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
ADDOP(c, YIELD_FROM);
break;
case Await_kind:
@@ -4475,7 +4477,7 @@
VISIT(c, expr, e->v.Await.value);
ADDOP(c, GET_AWAITABLE);
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
ADDOP(c, YIELD_FROM);
break;
case Compare_kind:
@@ -4483,26 +4485,26 @@
case Call_kind:
return compiler_call(c, e);
case Constant_kind:
- ADDOP_O(c, LOAD_CONST, e->v.Constant.value, consts);
+ ADDOP_LOAD_CONST(c, e->v.Constant.value);
break;
case Num_kind:
- ADDOP_O(c, LOAD_CONST, e->v.Num.n, consts);
+ ADDOP_LOAD_CONST(c, e->v.Num.n);
break;
case Str_kind:
- ADDOP_O(c, LOAD_CONST, e->v.Str.s, consts);
+ ADDOP_LOAD_CONST(c, e->v.Str.s);
break;
case JoinedStr_kind:
return compiler_joined_str(c, e);
case FormattedValue_kind:
return compiler_formatted_value(c, e);
case Bytes_kind:
- ADDOP_O(c, LOAD_CONST, e->v.Bytes.s, consts);
+ ADDOP_LOAD_CONST(c, e->v.Bytes.s);
break;
case Ellipsis_kind:
- ADDOP_O(c, LOAD_CONST, Py_Ellipsis, consts);
+ ADDOP_LOAD_CONST(c, Py_Ellipsis);
break;
case NameConstant_kind:
- ADDOP_O(c, LOAD_CONST, e->v.NameConstant.value, consts);
+ ADDOP_LOAD_CONST(c, e->v.NameConstant.value);
break;
/* The following exprs can be assignment targets. */
case Attribute_kind:
@@ -4739,10 +4741,7 @@
}
ADDOP_NAME(c, LOAD_NAME, __annotations__, names);
mangled = _Py_Mangle(c->u->u_private, targ->v.Name.id);
- if (!mangled) {
- return 0;
- }
- ADDOP_N(c, LOAD_CONST, mangled, consts);
+ ADDOP_LOAD_CONST_NEW(c, mangled);
ADDOP(c, STORE_SUBSCR);
}
break;
@@ -4842,14 +4841,14 @@
VISIT(c, expr, s->v.Slice.lower);
}
else {
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
}
if (s->v.Slice.upper) {
VISIT(c, expr, s->v.Slice.upper);
}
else {
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
}
if (s->v.Slice.step) {
@@ -5299,6 +5298,25 @@
return NULL;
while (PyDict_Next(dict, &pos, &k, &v)) {
i = PyLong_AS_LONG(v);
+ Py_INCREF(k);
+ assert((i - offset) < size);
+ assert((i - offset) >= 0);
+ PyTuple_SET_ITEM(tuple, i - offset, k);
+ }
+ return tuple;
+}
+
+static PyObject *
+consts_dict_keys_inorder(PyObject *dict)
+{
+ PyObject *consts, *k, *v;
+ Py_ssize_t i, pos = 0, size = PyDict_GET_SIZE(dict);
+
+ consts = PyList_New(size); /* PyCode_Optimize() requires a list */
+ if (consts == NULL)
+ return NULL;
+ while (PyDict_Next(dict, &pos, &k, &v)) {
+ i = PyLong_AS_LONG(v);
/* The keys of the dictionary can be tuples wrapping a contant.
* (see compiler_add_o and _PyCode_ConstantKey). In that case
* the object we want is always second. */
@@ -5306,11 +5324,11 @@
k = PyTuple_GET_ITEM(k, 1);
}
Py_INCREF(k);
- assert((i - offset) < size);
- assert((i - offset) >= 0);
- PyTuple_SET_ITEM(tuple, i - offset, k);
+ assert(i < size);
+ assert(i >= 0);
+ PyList_SET_ITEM(consts, i, k);
}
- return tuple;
+ return consts;
}
static int
@@ -5357,12 +5375,7 @@
int flags;
int argcount, kwonlyargcount, maxdepth;
- tmp = dict_keys_inorder(c->u->u_consts, 0);
- if (!tmp)
- goto error;
- consts = PySequence_List(tmp); /* optimize_code requires a list */
- Py_DECREF(tmp);
-
+ consts = consts_dict_keys_inorder(c->u->u_consts);
names = dict_keys_inorder(c->u->u_names, 0);
varnames = dict_keys_inorder(c->u->u_varnames, 0);
if (!consts || !names || !varnames)
@@ -5371,7 +5384,7 @@
cellvars = dict_keys_inorder(c->u->u_cellvars, 0);
if (!cellvars)
goto error;
- freevars = dict_keys_inorder(c->u->u_freevars, PyTuple_Size(cellvars));
+ freevars = dict_keys_inorder(c->u->u_freevars, PyTuple_GET_SIZE(cellvars));
if (!freevars)
goto error;
@@ -5467,7 +5480,7 @@
if (!c->u->u_curblock->b_return) {
NEXT_BLOCK(c);
if (addNone)
- ADDOP_O(c, LOAD_CONST, Py_None, consts);
+ ADDOP_LOAD_CONST(c, Py_None);
ADDOP(c, RETURN_VALUE);
}