Skip to content

bpo-29469: peephole: Remove const_stack #4879

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
methane merged 5 commits into from
Dec 18, 2017
Merged

bpo-29469: peephole: Remove const_stack #4879

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
915a1a4
bpo-29469: peephole: Remove const_stack
methane Dec 15, 2017
ca5bacf
fixup
methane Dec 15, 2017
b8d6ab0
Reformat code.
methane Dec 18, 2017
d435e6c
More cleanup
methane Dec 18, 2017
492f473
fix
methane Dec 18, 2017
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
Reformat code. 
http://wiki.c2.com/?DeclareVariablesAtFirstUse
  • Loading branch information
@methane
methane committed Dec 18, 2017
commit b8d6ab053fb3bd34410eb8f3bda39091f8cde4cc
13 changes: 4 additions & 9 deletions Python/peephole.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,31 +131,25 @@ static Py_ssize_t
fold_tuple_on_constants(_Py_CODEUNIT *codestr, Py_ssize_t c_start,
Py_ssize_t opcode_end, PyObject *consts, int n)
{
PyObject *newconst, *constant;

/* Pre-conditions */
assert(PyList_CheckExact(consts));

/* Buildup new tuple of constants */
newconst = PyTuple_New(n);
PyObject *newconst = PyTuple_New(n);
if (newconst == NULL) {
return -1;
}

Py_ssize_t len_consts = PyList_GET_SIZE(consts);
Py_ssize_t i, pos;

for (i=0, pos=c_start; i<n; i++, pos++) {
for (Py_ssize_t i = 0, pos = c_start; i < n; i++, pos++) {
assert(pos < opcode_end);
pos = find_op(codestr, pos);
assert(_Py_OPCODE(codestr[pos]) == LOAD_CONST);

unsigned int arg = get_arg(codestr, pos);
constant = PyList_GET_ITEM(consts, arg);
PyObject *constant = PyList_GET_ITEM(consts, arg);
Py_INCREF(constant);
PyTuple_SET_ITEM(newconst, i, constant);
}
assert(_Py_OPCODE(codestr[find_op(codestr, pos)]) == BUILD_TUPLE);

/* Append folded constant onto consts */
if (PyList_Append(consts, newconst)) {
Expand All @@ -164,6 +158,7 @@ fold_tuple_on_constants(_Py_CODEUNIT *codestr, Py_ssize_t c_start,
}
Py_DECREF(newconst);

Py_ssize_t len_consts = PyList_GET_SIZE(consts);
return copy_op_arg(codestr, c_start, LOAD_CONST, len_consts, opcode_end);
}

Expand Down