Skip to content

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

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 20 commits into from
Dec 14, 2017
Merged

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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
remove noop functions
  • Loading branch information
@methane
methane committed Dec 12, 2017
commit 5da07391c79cbcee9cb483e7dddea99fd244a05d
75 changes: 0 additions & 75 deletions Python/ast_opt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,19 +288,13 @@ static int fold_compare(expr_ty node, PyArena *arena)
static int astfold_mod(mod_ty node_, PyArena* ctx_);
static int astfold_stmt(stmt_ty node_, PyArena* ctx_);
static int astfold_expr(expr_ty node_, PyArena* ctx_);
static int astfold_boolop(boolop_ty node_, PyArena* ctx_);
static int astfold_operator(operator_ty node_, PyArena* ctx_);
static int astfold_unaryop(unaryop_ty node_, PyArena* ctx_);
static int astfold_arguments(arguments_ty node_, PyArena* ctx_);
static int astfold_comprehension(comprehension_ty node_, PyArena* ctx_);
static int astfold_cmpop(cmpop_ty node_, PyArena* ctx_);
static int astfold_keyword(keyword_ty node_, PyArena* ctx_);
static int astfold_expr_context(expr_context_ty node_, PyArena* ctx_);
static int astfold_slice(slice_ty node_, PyArena* ctx_);
static int astfold_arg(arg_ty node_, PyArena* ctx_);
static int astfold_withitem(withitem_ty node_, PyArena* ctx_);
static int astfold_excepthandler(excepthandler_ty node_, PyArena* ctx_);
static int astfold_alias(alias_ty node_, PyArena* ctx_);
#define CALL(FUNC, TYPE, ARG) \
if (!FUNC((ARG), ctx_)) \
return 0;
Expand Down Expand Up @@ -354,17 +348,14 @@ static int astfold_expr(expr_ty node_, PyArena* ctx_)
{
switch (node_->kind) {
case BoolOp_kind:
CALL(astfold_boolop, boolop_ty, node_->v.BoolOp.op);
CALL_SEQ(astfold_expr, expr_ty, node_->v.BoolOp.values);
break;
case BinOp_kind:
CALL(astfold_expr, expr_ty, node_->v.BinOp.left);
CALL(astfold_operator, operator_ty, node_->v.BinOp.op);
CALL(astfold_expr, expr_ty, node_->v.BinOp.right);
CALL(fold_binop, expr_ty, node_);
break;
case UnaryOp_kind:
CALL(astfold_unaryop, unaryop_ty, node_->v.UnaryOp.op);
CALL(astfold_expr, expr_ty, node_->v.UnaryOp.operand);
CALL(fold_unaryop, expr_ty, node_);
break;
Expand Down Expand Up @@ -412,7 +403,6 @@ static int astfold_expr(expr_ty node_, PyArena* ctx_)
break;
case Compare_kind:
CALL(astfold_expr, expr_ty, node_->v.Compare.left);
CALL_INT_SEQ(astfold_cmpop, cmpop_ty, node_->v.Compare.ops);
CALL_SEQ(astfold_expr, expr_ty, node_->v.Compare.comparators);
CALL(fold_compare, expr_ty, node_);
break;
Expand All @@ -430,28 +420,20 @@ static int astfold_expr(expr_ty node_, PyArena* ctx_)
break;
case Attribute_kind:
CALL(astfold_expr, expr_ty, node_->v.Attribute.value);
CALL(astfold_expr_context, expr_context_ty, node_->v.Attribute.ctx);
break;
case Subscript_kind:
CALL(astfold_expr, expr_ty, node_->v.Subscript.value);
CALL(astfold_slice, slice_ty, node_->v.Subscript.slice);
CALL(astfold_expr_context, expr_context_ty, node_->v.Subscript.ctx);
CALL(fold_subscr, expr_ty, node_);
break;
case Starred_kind:
CALL(astfold_expr, expr_ty, node_->v.Starred.value);
CALL(astfold_expr_context, expr_context_ty, node_->v.Starred.ctx);
break;
case Name_kind:
CALL(astfold_expr_context, expr_context_ty, node_->v.Name.ctx);
break;
case List_kind:
CALL_SEQ(astfold_expr, expr_ty, node_->v.List.elts);
CALL(astfold_expr_context, expr_context_ty, node_->v.List.ctx);
break;
case Tuple_kind:
CALL_SEQ(astfold_expr, expr_ty, node_->v.Tuple.elts);
CALL(astfold_expr_context, expr_context_ty, node_->v.Tuple.ctx);
CALL(fold_tuple, expr_ty, node_);
break;
default:
Expand Down Expand Up @@ -480,30 +462,12 @@ static int astfold_slice(slice_ty node_, PyArena* ctx_)
return 1;
}

static int astfold_expr_context(expr_context_ty node_, PyArena* ctx_)
{
switch (node_) {
default:
break;
}
return 1;
}

static int astfold_keyword(keyword_ty node_, PyArena* ctx_)
{
CALL(astfold_expr, expr_ty, node_->value);
return 1;
}

static int astfold_cmpop(cmpop_ty node_, PyArena* ctx_)
{
switch (node_) {
default:
break;
}
return 1;
}

static int astfold_comprehension(comprehension_ty node_, PyArena* ctx_)
{
CALL(astfold_expr, expr_ty, node_->target);
Expand All @@ -529,33 +493,6 @@ static int astfold_arg(arg_ty node_, PyArena* ctx_)
return 1;
}

static int astfold_unaryop(unaryop_ty node_, PyArena* ctx_)
{
switch (node_) {
default:
break;
}
return 1;
}

static int astfold_operator(operator_ty node_, PyArena* ctx_)
{
switch (node_) {
default:
break;
}
return 1;
}

static int astfold_boolop(boolop_ty node_, PyArena* ctx_)
{
switch (node_) {
default:
break;
}
return 1;
}

static int astfold_stmt(stmt_ty node_, PyArena* ctx_)
{
switch (node_->kind) {
Expand Down Expand Up @@ -589,7 +526,6 @@ static int astfold_stmt(stmt_ty node_, PyArena* ctx_)
break;
case AugAssign_kind:
CALL(astfold_expr, expr_ty, node_->v.AugAssign.target);
CALL(astfold_operator, operator_ty, node_->v.AugAssign.op);
CALL(astfold_expr, expr_ty, node_->v.AugAssign.value);
break;
case AnnAssign_kind:
Expand Down Expand Up @@ -641,12 +577,6 @@ static int astfold_stmt(stmt_ty node_, PyArena* ctx_)
CALL(astfold_expr, expr_ty, node_->v.Assert.test);
CALL_OPT(astfold_expr, expr_ty, node_->v.Assert.msg);
break;
case Import_kind:
CALL_SEQ(astfold_alias, alias_ty, node_->v.Import.names);
break;
case ImportFrom_kind:
CALL_SEQ(astfold_alias, alias_ty, node_->v.ImportFrom.names);
break;
case Expr_kind:
CALL(astfold_expr, expr_ty, node_->v.Expr.value);
break;
Expand All @@ -656,11 +586,6 @@ static int astfold_stmt(stmt_ty node_, PyArena* ctx_)
return 1;
}

static int astfold_alias(alias_ty node_, PyArena* ctx_)
{
return 1;
}

static int astfold_excepthandler(excepthandler_ty node_, PyArena* ctx_)
{
switch (node_->kind) {
Expand Down