From 615cb001bb90ef2acb21c011918b456c59ddb5de Mon Sep 17 00:00:00 2001 From: Daniel Berlin Date: Wed, 10 Dec 2008 20:13:39 +0000 Subject: [PATCH] re PR tree-optimization/36792 (Revision 137631 causes many failures) 2008-12-10 Daniel Berlin PR tree-optimization/36792 * tree-ssa-pre.c (compute_avail): Don't insert defs into maximal set. From-SVN: r142659 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-10.c | 4 +++- gcc/tree-ssa-pre.c | 5 +---- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2a1d73f6685..a544a15b297 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-12-10 Daniel Berlin + + PR tree-optimization/36792 + * tree-ssa-pre.c (compute_avail): Don't insert defs into maximal + set. + 2008-12-10 Alexandre Oliva PR target/37033 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4fa8dc23660..659a5bf24e0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-12-10 Daniel Berlin + + PR tree-optimization/36792 + * gcc.dg/tree-ssa/ssa-fre-10.c: Update expected results. + 2008-12-10 Alexandre Oliva PR middle-end/38271 diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-10.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-10.c index cfbb9c97b16..a27f2d6c023 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-10.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-10.c @@ -4,6 +4,8 @@ union loc { unsigned reg; signed offset; }; void __frame_state_for (volatile char *state_in, int x) { + /* We should move all the loads out of this loop. Right now, we only + move one. It takes two insertions because we insert a cast. */ union loc fs; int reg; for (;;) { @@ -16,5 +18,5 @@ void __frame_state_for (volatile char *state_in, int x) } } -/* { dg-final { scan-tree-dump-not "Insertions:" "pre" } } */ +/* { dg-final { scan-tree-dump "Insertions: 2" "pre" } } */ /* { dg-final { cleanup-tree-dump "pre" } } */ diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index 7773fe96b6f..61448fd7295 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -3644,10 +3644,7 @@ compute_avail (void) add_to_value (get_expr_value_id (e), e); if (!in_fre) - { - bitmap_insert_into_set (TMP_GEN (block), e); - bitmap_value_insert_into_set (maximal_set, e); - } + bitmap_insert_into_set (TMP_GEN (block), e); bitmap_value_insert_into_set (AVAIL_OUT (block), e); }