re PR tree-optimization/36792 (Revision 137631 causes many failures)

2008-12-10  Daniel Berlin  <dberlin@dberlin.org>

	PR tree-optimization/36792
	* tree-ssa-pre.c (compute_avail): Don't insert defs into maximal
	set.

From-SVN: r142659

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a1d73f668504e7370ac14a7fc19fe4cb15e2b5f..a544a15b2970c9e0e0eae4b8823be080dc17a2a6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-10  Daniel Berlin  <dberlin@dberlin.org>
+
+       PR tree-optimization/36792
+       * tree-ssa-pre.c (compute_avail): Don't insert defs into maximal
+       set.
+
 2008-12-10  Alexandre Oliva  <aoliva@redhat.com>
 
        PR target/37033

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4fa8dc2366050ee31f0b2610dcfaa86e25173ff6..659a5bf24e0dfa69dc1fb819d4220753d9d2c40f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-10  Daniel Berlin  <dberlin@dberlin.org>
+
+       PR tree-optimization/36792
+       * gcc.dg/tree-ssa/ssa-fre-10.c: Update expected results.
+
 2008-12-10  Alexandre Oliva  <aoliva@redhat.com>
 
        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 cfbb9c97b163040e1b3e0d2b974ab0310c3d4dfc..a27f2d6c023c9cc39e246de63917c3dcc4b6cd48 100644 (file)
--- 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 7773fe96b6fc9c0525a9eff8246ec8a7533b8f7a..61448fd72957b78eac5c44857cd0fcfcb424a3b4 100644 (file)
--- 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);
            }