diff options
| author | Richard Biener <rguenther@suse.de> | 2017-07-26 11:35:45 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2017-07-26 11:35:45 +0000 |
| commit | 4f450a2b1022124194097e39b3b1caca1d5dc2bc (patch) | |
| tree | 952eff26eae11dd5471be7d46169494d5b16a908 /gcc/genmatch.c | |
| parent | e17114487df7f90d8e015efad697a3cc93845b90 (diff) | |
| download | gcc-4f450a2b1022124194097e39b3b1caca1d5dc2bc.zip gcc-4f450a2b1022124194097e39b3b1caca1d5dc2bc.tar.gz gcc-4f450a2b1022124194097e39b3b1caca1d5dc2bc.tar.bz2 | |
gimple-match-head.c (do_valueize): Return OP if valueize returns NULL_TREE.
2017-07-26 Richard Biener <rguenther@suse.de>
* gimple-match-head.c (do_valueize): Return OP if valueize
returns NULL_TREE.
(get_def): New helper to get at the def stmt of a SSA name
if valueize allows.
* genmatch.c (dt_node::gen_kids_1): Use get_def instead of
do_valueize to get at the def stmt.
(dt_operand::gen_gimple_expr): Simplify do_valueize calls.
* gcc/testsuite/gcc.dg/pr70920-2.c: Adjust for transform already
happening in ccp1.
* gcc/testsuite/gcc.dg/pr70920-4.c: Likewise.
From-SVN: r250565
Diffstat (limited to 'gcc/genmatch.c')
| -rw-r--r-- | gcc/genmatch.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/gcc/genmatch.c b/gcc/genmatch.c index 43f8372..6564a1a 100644 --- a/gcc/genmatch.c +++ b/gcc/genmatch.c @@ -2646,6 +2646,7 @@ dt_operand::gen_gimple_expr (FILE *f, int indent) expr *e = static_cast<expr *> (op); id_base *id = e->operation; unsigned n_ops = e->ops.length (); + unsigned n_braces = 0; for (unsigned i = 0; i < n_ops; ++i) { @@ -2678,14 +2679,15 @@ dt_operand::gen_gimple_expr (FILE *f, int indent) "if ((TREE_CODE (%s) == SSA_NAME\n", child_opname); fprintf_indent (f, indent, - " || is_gimple_min_invariant (%s))\n", + " || is_gimple_min_invariant (%s)))\n", child_opname); fprintf_indent (f, indent, - " && (%s = do_valueize (valueize, %s)))\n", - child_opname, child_opname); - fprintf_indent (f, indent, " {\n"); indent += 4; + n_braces++; + fprintf_indent (f, indent, + "%s = do_valueize (valueize, %s);\n", + child_opname, child_opname); continue; } else @@ -2698,10 +2700,8 @@ dt_operand::gen_gimple_expr (FILE *f, int indent) "tree %s = gimple_call_arg (def, %u);\n", child_opname, i); fprintf_indent (f, indent, - "if ((%s = do_valueize (valueize, %s)))\n", + "%s = do_valueize (valueize, %s);\n", child_opname, child_opname); - fprintf_indent (f, indent, " {\n"); - indent += 4; } /* While the toplevel operands are canonicalized by the caller after valueizing operands of sub-expressions we have to @@ -2726,7 +2726,7 @@ dt_operand::gen_gimple_expr (FILE *f, int indent) } } - return n_ops; + return n_braces; } /* Generate GENERIC matching code for the decision tree operand. */ @@ -2867,14 +2867,10 @@ dt_node::gen_kids_1 (FILE *f, int indent, bool gimple, fprintf_indent (f, indent, "case SSA_NAME:\n"); fprintf_indent (f, indent, - " if (do_valueize (valueize, %s) != NULL_TREE)\n", + " if (gimple *def_stmt = get_def (valueize, %s))\n", kid_opname); fprintf_indent (f, indent, " {\n"); - fprintf_indent (f, indent, - " gimple *def_stmt = SSA_NAME_DEF_STMT (%s);\n", - kid_opname); - indent += 6; if (exprs_len) { |