From 681a3d868dc7f72c062905e9b4d17e206f2ede81 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Wed, 13 May 2015 12:36:47 +0000 Subject: gimple-expr.h (is_gimple_constant): Reorder. * gimple-expr.h (is_gimple_constant): Reorder. * tree-ssa-propagate.c (before_dom_children): Use inline accessor. From-SVN: r223156 --- gcc/ChangeLog | 5 +++++ gcc/gimple-expr.h | 2 +- gcc/tree-ssa-propagate.c | 4 +--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2f8a020..f85bbae 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-05-13 Eric Botcazou + + * gimple-expr.h (is_gimple_constant): Reorder. + * tree-ssa-propagate.c (before_dom_children): Use inline accessor. + 2015-05-13 Segher Boessenkool * combine.c (simplify_set): When generating a CC set, if the diff --git a/gcc/gimple-expr.h b/gcc/gimple-expr.h index a50a90a..ed23eb2 100644 --- a/gcc/gimple-expr.h +++ b/gcc/gimple-expr.h @@ -136,9 +136,9 @@ is_gimple_constant (const_tree t) case INTEGER_CST: case REAL_CST: case FIXED_CST: - case STRING_CST: case COMPLEX_CST: case VECTOR_CST: + case STRING_CST: return true; default: diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c index e23da70..cc2b1c4 100644 --- a/gcc/tree-ssa-propagate.c +++ b/gcc/tree-ssa-propagate.c @@ -1246,9 +1246,7 @@ substitute_and_fold_dom_walker::before_dom_children (basic_block bb) && gimple_call_noreturn_p (stmt)) stmts_to_fixup.safe_push (stmt); - if (is_gimple_assign (stmt) - && (get_gimple_rhs_class (gimple_assign_rhs_code (stmt)) - == GIMPLE_SINGLE_RHS)) + if (gimple_assign_single_p (stmt)) { tree rhs = gimple_assign_rhs1 (stmt); -- cgit v1.1