diff options
| author | Richard Henderson <rth@redhat.com> | 2009-09-01 07:37:52 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2009-09-01 07:37:52 -0700 |
| commit | cd6ea7a2df112ac0a9e1afb01aef3b70b354f829 (patch) | |
| tree | 0d26fd11397c9b6e1e2da0ef0abcefda20d1f05a | |
| parent | fd58da50fd14dff9640caf4b3a760d880d270f45 (diff) | |
| download | gcc-cd6ea7a2df112ac0a9e1afb01aef3b70b354f829.zip gcc-cd6ea7a2df112ac0a9e1afb01aef3b70b354f829.tar.gz gcc-cd6ea7a2df112ac0a9e1afb01aef3b70b354f829.tar.bz2 | |
Force block enders to be simulated once.
From-SVN: r151273
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/tree-ssa-ccp.c | 10 | ||||
| -rw-r--r-- | gcc/tree-vrp.c | 15 |
3 files changed, 26 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 746ff69..2ea5c85 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2009-09-01 Richard Henderson <rth@redhat.com> + + * tree-ssa-ccp.c (ccp_initialize): Make sure to simulate + stmt_ends_pp_p statements at least once. + * tree-vrp.c (vrp_initialize): Likewise. + (vrp_visit_stmt): Be prepared for non-interesting stmts. + 2009-09-01 Dodji Seketeli <dodji@redhat.com> PR bootstrap/41205 diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index b359d4c..949c4b5 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -650,7 +650,15 @@ ccp_initialize (void) for (i = gsi_start_bb (bb); !gsi_end_p (i); gsi_next (&i)) { gimple stmt = gsi_stmt (i); - bool is_varying = surely_varying_stmt_p (stmt); + bool is_varying; + + /* If the statement is a control insn, then we do not + want to avoid simulating the statement once. Failure + to do so means that those edges will never get added. */ + if (stmt_ends_bb_p (stmt)) + is_varying = false; + else + is_varying = surely_varying_stmt_p (stmt); if (is_varying) { diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 5379b75..237245e 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -5317,7 +5317,12 @@ vrp_initialize (void) { gimple stmt = gsi_stmt (si); - if (!stmt_interesting_for_vrp (stmt)) + /* If the statement is a control insn, then we do not + want to avoid simulating the statement once. Failure + to do so means that those edges will never get added. */ + if (stmt_ends_bb_p (stmt)) + prop_set_simulate_again (stmt, true); + else if (!stmt_interesting_for_vrp (stmt)) { ssa_op_iter i; tree def; @@ -5326,9 +5331,7 @@ vrp_initialize (void) prop_set_simulate_again (stmt, false); } else - { - prop_set_simulate_again (stmt, true); - } + prop_set_simulate_again (stmt, true); } } } @@ -6087,7 +6090,9 @@ vrp_visit_stmt (gimple stmt, edge *taken_edge_p, tree *output_p) fprintf (dump_file, "\n"); } - if (is_gimple_assign (stmt) || is_gimple_call (stmt)) + if (!stmt_interesting_for_vrp (stmt)) + gcc_assert (stmt_ends_bb_p (stmt)); + else if (is_gimple_assign (stmt) || is_gimple_call (stmt)) { /* In general, assignments with virtual operands are not useful for deriving ranges, with the obvious exception of calls to |