Skip to content
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.

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

bpo-38328: Speed up the creation time of constant list and set literals. #17114

Merged
merged 12 commits into from
Nov 26, 2019
2 changes: 1 addition & 1 deletion Lib/test/test_sys.py
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ def get_gen(): yield 1
# list
samples = [[], [1,2,3], ['1', '2', '3']]
for sample in samples:
check(sample, vsize('Pn') + len(sample)*self.P)
check(list(sample), vsize('Pn') + len(sample)*self.P)
methane marked this conversation as resolved.
Show resolved Hide resolved
# sortwrapper (list)
# XXX
# cmpwrapper (list)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Sped up the creation time of constant :class:`list` and :class:`set` displays.
Patch by Brandt Bucher.
22 changes: 22 additions & 0 deletions Python/compile.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ static int compiler_visit_slice(struct compiler *, slice_ty,
expr_context_ty);

static int inplace_binop(struct compiler *, operator_ty);
static int are_all_items_const(asdl_seq *, Py_ssize_t, Py_ssize_t);
static int expr_constant(expr_ty);

static int compiler_with(struct compiler *, stmt_ty, int);
Expand Down Expand Up @@ -3655,6 +3656,27 @@ starunpack_helper(struct compiler *c, asdl_seq *elts,
{
Py_ssize_t n = asdl_seq_LEN(elts);
Py_ssize_t i, nsubitems = 0, nseen = 0;
if (n > 2 && are_all_items_const(elts, 0, n)) {
PyObject *folded = PyTuple_New(n);
if (folded == NULL) {
return 0;
}
PyObject *val;
for (i = 0; i < n; i++) {
val = ((expr_ty)asdl_seq_GET(elts, i))->v.Constant.value;
Py_INCREF(val);
PyTuple_SET_ITEM(folded, i, val);
}
if (outer_op == BUILD_SET_UNPACK) {
Py_SETREF(folded, PyFrozenSet_New(folded));
if (folded == NULL) {
return 0;
}
}
ADDOP_LOAD_CONST_NEW(c, folded);
ADDOP_I(c, outer_op, 1);
return 1;
}
for (i = 0; i < n; i++) {
expr_ty elt = asdl_seq_GET(elts, i);
if (elt->kind == Starred_kind) {
Expand Down