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.

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

bpo-29469: Move constant folding at AST level #2858

Merged
merged 20 commits into from
Dec 14, 2017
Merged

bpo-29469: Move constant folding at AST level #2858

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b0c4745
bpo-29469: Move constant folding at AST level
methane Jul 25, 2017
a4edbc3
stable visitor order
methane Jul 26, 2017
9b0f10c
remove simple constant folding from peephole
methane Jul 26, 2017
a603d5b
stabilize prototype order
methane Jul 26, 2017
e2ae3fd
Merge remote-tracking branch 'origin/master' into ast-constant-fold
methane Oct 6, 2017
43ae08a
Merge remote-tracking branch 'origin/master' into ast-constant-fold
methane Dec 4, 2017
04fb56c
Remove code generator for ast_opt.c
methane Dec 12, 2017
5da0739
remove noop functions
methane Dec 12, 2017
af2a46b
make regen-all
methane Dec 12, 2017
078c1ed
Fix test.test_plistlib.TestPlistlib.test_tuple_members
methane Dec 12, 2017
b64240d
Merge remote-tracking branch 'origin/master' into ast-constant-fold
methane Dec 13, 2017
89c54ad
return type should be separated line
methane Dec 13, 2017
94160d4
Use Py_UNREACHABLE()
methane Dec 13, 2017
e416c5f
Fix KeyboardInterrupt handling
methane Dec 13, 2017
3f34890
Use designated initializer
methane Dec 13, 2017
e1f466d
Fix error handling in fold_binop()
methane Dec 13, 2017
1f3fc8e
fix
methane Dec 13, 2017
17396dc
Add NEWS entry
methane Dec 13, 2017
de2effe
fix
methane Dec 13, 2017
30edda9
make regen-all
methane Dec 14, 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
2 changes: 2 additions & 0 deletions Include/compile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name);
#define PY_INVALID_STACK_EFFECT INT_MAX
PyAPI_FUNC(int) PyCompile_OpcodeStackEffect(int opcode, int oparg);

PyAPI_FUNC(int) _PyAST_Optimize(struct _mod *, PyArena *arena);

#ifdef __cplusplus
}
#endif
Expand Down
1 change: 0 additions & 1 deletion Lib/test/test_plistlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ def test_tuple_members(self):
'second': [1, 2],
'third': [3, 4],
})
self.assertIsNot(pl2['first'], pl2['second'])
Copy link
Member

Choose a reason for hiding this comment

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

Good catch! This test can fail in other implementations. It should be fixed in 3.6 too. Opened #4813 for this.


def test_list_members(self):
pl = {
Expand Down
1 change: 1 addition & 0 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ PYTHON_OBJS= \
Python/Python-ast.o \
Python/asdl.o \
Python/ast.o \
Python/ast_opt.o \
Python/bltinmodule.o \
Python/ceval.o \
Python/compile.o \
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2017-07-26-00-20-15.bpo-29469.potmyI.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Move constant folding from bytecode layer to AST layer.
Original patch by Eugene Toder.
1 change: 1 addition & 0 deletions PCbuild/pythoncore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@
<ClCompile Include="..\Python\_warnings.c" />
<ClCompile Include="..\Python\asdl.c" />
<ClCompile Include="..\Python\ast.c" />
<ClCompile Include="..\Python\ast_opt.c" />
<ClCompile Include="..\Python\bltinmodule.c" />
<ClCompile Include="..\Python\bootstrap_hash.c" />
<ClCompile Include="..\Python\ceval.c" />
Expand Down
3 changes: 3 additions & 0 deletions PCbuild/pythoncore.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,9 @@
<ClCompile Include="..\Python\ast.c">
<Filter>Python</Filter>
</ClCompile>
<ClCompile Include="..\Python\ast_opt.c">
<Filter>Python</Filter>
</ClCompile>
<ClCompile Include="..\Python\bltinmodule.c">
<Filter>Python</Filter>
</ClCompile>
Expand Down
Loading