Skip to content

bpo-41323: Perform 'peephole' optimizations directly on the CFG. #21517

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 8 commits into from
Jul 30, 2020
Merged

bpo-41323: Perform 'peephole' optimizations directly on the CFG. #21517

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d5b4bda
Move 'peephole' optimizations into compile.c and perform them directl…
markshannon Jul 17, 2020
c480401
Regenerate frozen importlib.
markshannon Jul 17, 2020
6b7019a
Remove commented out code.
markshannon Jul 17, 2020
a2915d5
Two minor code tidy ups.
markshannon Jul 20, 2020
7bc2522
Remove peephole.c
markshannon Jul 20, 2020
fda0bed
Fix leak in mark_reachable.
markshannon Jul 20, 2020
17541b6
Treat jumps to empty blocks as jumps to the following block.
markshannon Jul 21, 2020
1b57a42
Regenerate importlib
markshannon Jul 21, 2020
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
Two minor code tidy ups.
  • Loading branch information
@markshannon
markshannon committed Jul 20, 2020
commit a2915d507c60afbfaf394a0fe33ccd65cf2dc7b0
4 changes: 2 additions & 2 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5882,9 +5882,9 @@ makecode(struct compiler *c, struct assembler *a, PyObject *consts)

names = dict_keys_inorder(c->u->u_names, 0);
varnames = dict_keys_inorder(c->u->u_varnames, 0);
if (!names || !varnames)
if (!names || !varnames) {
goto error;

}
cellvars = dict_keys_inorder(c->u->u_cellvars, 0);
if (!cellvars)
goto error;
Expand Down
7 changes: 2 additions & 5 deletions Python/peephole.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
* Optimization is now done in the compiler */

PyObject *
PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
PyObject *lnotab_obj)
PyCode_Optimize(PyObject *code, PyObject* Py_UNUSED(consts),
PyObject *Py_UNUSED(names), PyObject *Py_UNUSED(lnotab_obj))
{
Py_INCREF(code);
Copy link
Copy Markdown
Member

@pablogsal pablogsal Jul 17, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use Py_UNUSED for the ones that are not code in the function declaration.

Copy link
Copy Markdown
Member Author

@markshannon markshannon Jul 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

(void)consts;
(void)names;
(void)lnotab_obj;
return code;
}