backport: re PR rtl-optimization/48141 (DSE compile time hog)

	Backported from mainline
	2011-03-17  Jakub Jelinek  <jakub@redhat.com>

	PR rtl-optimization/48141
	* dse.c (record_store): If no positions are needed in an insn
	that cannot be deleted, at least unchain it from active_local_stores.

	* gcc.dg/pr48141.c: New test.

From-SVN: r172116

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5fe612b12971ebc0312613115b43e61fb5f2da44..01ce6860d7d748a08af460e83e7ec15a302e785e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2011-04-07  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2011-03-17  Jakub Jelinek  <jakub@redhat.com>
+
+       PR rtl-optimization/48141
+       * dse.c (record_store): If no positions are needed in an insn
+       that cannot be deleted, at least unchain it from active_local_stores.
+
        2011-03-03  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/47963

diff --git a/gcc/dse.c b/gcc/dse.c
index 2be8a942c75fe3749bdc7007aae4fb08395beaa0..4f7a0683b9c5701fab5019f0a68a8464bb7d49d7 100644 (file)
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -1592,8 +1592,7 @@ record_store (rtx body, bb_info_t bb_info)
 
       /* An insn can be deleted if every position of every one of
         its s_infos is zero.  */
-      if (any_positions_needed_p (s_info)
-         || ptr->cannot_delete)
+      if (any_positions_needed_p (s_info))
        del = false;
 
       if (del)
@@ -1605,7 +1604,8 @@ record_store (rtx body, bb_info_t bb_info)
          else
            active_local_stores = ptr->next_local_store;
 
-         delete_dead_store_insn (insn_to_delete);
+         if (!insn_to_delete->cannot_delete)
+           delete_dead_store_insn (insn_to_delete);
        }
       else
        last = ptr;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a924b4356b3e3d734592c85f1fb24a4de2369f94..175a4548ac81b5679d5ae9fce776753170609c2c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2011-04-07  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2011-03-17  Jakub Jelinek  <jakub@redhat.com>
+
+       PR rtl-optimization/48141
+       * gcc.dg/pr48141.c: New test.
+
        2011-03-03  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/47963

diff --git a/gcc/testsuite/gcc.dg/pr48141.c b/gcc/testsuite/gcc.dg/pr48141.c
new file mode 100644 (file)
index 0000000..c2ef79f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr48141.c
@@ -0,0 +1,17 @@
+/* PR rtl-optimization/48141 */
+/* { dg-do compile } */
+/* { dg-options "-O -fno-tree-fre" } */
+
+#define A i = 0;
+#define B A A A A A A A A A A
+#define C B B B B B B B B B B
+#define D C C C C C C C C C C
+#define E D D D D D D D D D D
+
+int
+foo (void)
+{
+  volatile int i = 0;
+  E E E E E E E E E E E
+  return 0;
+}