diff options
| author | Daniel Berlin <dberlin@dberlin.org> | 2007-07-02 18:27:46 +0000 |
|---|---|---|
| committer | Daniel Berlin <dberlin@gcc.gnu.org> | 2007-07-02 18:27:46 +0000 |
| commit | f8b041959a5e27d45e65b2eadaa2510af47eee07 (patch) | |
| tree | b3a17425a2046a1213abed9bb5d9a77e72977ff5 /gcc/tree-ssa-pre.c | |
| parent | 943c54ce4925f9922b3e3b926c9b43a32bb16041 (diff) | |
| download | gcc-f8b041959a5e27d45e65b2eadaa2510af47eee07.zip gcc-f8b041959a5e27d45e65b2eadaa2510af47eee07.tar.gz gcc-f8b041959a5e27d45e65b2eadaa2510af47eee07.tar.bz2 | |
Fix PR tree-optimization/32583 Fix PR tree-optimization/32584
2007-07-02 Daniel Berlin <dberlin@dberlin.org>
Fix PR tree-optimization/32583
Fix PR tree-optimization/32584
* tree-ssa-pre.c (phi_translate): Always pass seen bitmap.
(phi_translate_set): Use phi_translate directly now.
(make_values_for_stmt): Don't value number RHS if we already know
it is constant.
From-SVN: r126222
Diffstat (limited to 'gcc/tree-ssa-pre.c')
| -rw-r--r-- | gcc/tree-ssa-pre.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index 913cd7d..059a2ad 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -1322,6 +1322,7 @@ phi_translate_1 (tree expr, bitmap_set_t set1, bitmap_set_t set2, gcc_unreachable (); } } + /* Translate EXPR using phis in PHIBLOCK, so that it has the values of the phis in PRED. Return NULL if we can't find a leader for each part of the @@ -1331,7 +1332,9 @@ static tree phi_translate (tree expr, bitmap_set_t set1, bitmap_set_t set2, basic_block pred, basic_block phiblock) { - return phi_translate_1 (expr, set1, set2, pred, phiblock, NULL); + bitmap_clear (seen_during_translate); + return phi_translate_1 (expr, set1, set2, pred, phiblock, + seen_during_translate); } /* For each expression in SET, translate the value handles through phi nodes @@ -1356,9 +1359,7 @@ phi_translate_set (bitmap_set_t dest, bitmap_set_t set, basic_block pred, for (i = 0; VEC_iterate (tree, exprs, i, expr); i++) { tree translated; - bitmap_clear (seen_during_translate); - translated = phi_translate_1 (expr, set, NULL, pred, phiblock, - seen_during_translate); + translated = phi_translate (expr, set, NULL, pred, phiblock); /* Don't add constants or empty translations to the cache, since we won't look them up that way, or use the result, anyway. */ @@ -3404,7 +3405,8 @@ make_values_for_stmt (tree stmt, basic_block block) lhsval = valvh ? valvh : get_value_handle (lhs); STRIP_USELESS_TYPE_CONVERSION (rhs); - if (can_value_number_operation (rhs)) + if (can_value_number_operation (rhs) + && (!lhsval || !is_gimple_min_invariant (lhsval))) { /* For value numberable operation, create a duplicate expression with the operands replaced |