revert: [multiple changes]

2013-02-18  Richard Biener  <rguenther@suse.de>

	Revert
	2013-02-04  Richard Biener  <rguenther@suse.de>

	Backport from mainline
	2012-07-04  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/53844
	* tree-ssa-dse.c (dse_possible_dead_store_p): Properly handle
	the loop virtual PHI.

	* g++.dg/tree-ssa/pr53844.C: New testcase.

From-SVN: r196120

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6f745c9351d2fc75f237ba7ce78c2c5aafc21ce0..0f164519f3acbb94d555258152d7285ca1df37d7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2013-02-18  Richard Biener  <rguenther@suse.de>
+
+       Revert
+       2013-02-04  Richard Biener  <rguenther@suse.de>
+
+       Backport from mainline
+       2012-07-04  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/53844
+       * tree-ssa-dse.c (dse_possible_dead_store_p): Properly handle
+       the loop virtual PHI.
+
 2013-02-13  David S. Miller  <davem@davemloft.net>
 
        * expmed.c (expand_shift_1): Only strip scalar integer subregs.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7f15f246b3b543928759c1af8838e4b3bbabf5a5..945fbc29ad5a2ac5c80780266c4dd544100db88d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2013-02-18  Richard Biener  <rguenther@suse.de>
+
+       Revert
+       2013-02-04  Richard Biener  <rguenther@suse.de>
+
+       Backport from mainline
+       2012-07-04  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/53844
+       * g++.dg/tree-ssa/pr53844.C: New testcase.
+
 2013-02-17  Tobias Burnus  <burnus@net-b.de>
            Mikael Morin  <mikael@gcc.gnu.org>
 

diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr53844.C b/gcc/testsuite/g++.dg/tree-ssa/pr53844.C
deleted file mode 100644 (file)
index 0be29d8..0000000
--- a/gcc/testsuite/g++.dg/tree-ssa/pr53844.C
+++ /dev/null
@@ -1,78 +0,0 @@
-// { dg-do compile }
-// { dg-options "-O2 -fdump-tree-optimized-vops" }
-
-struct VBase;
-
-//Very minimal numeric vector class where Base provides the policy
-template<typename Base=VBase>
-struct Vector : public Base{
-       
-       inline Vector(const Base& b)
-       :Base(b)
-       {
-       }
-
-       //Assignment from any other sort of Vector
-       template<typename Base2>
-       void operator= (const Vector<Base2>& from)
-       {
-               for(int i=0; i<100; i++){
-                       (*this)[i]=from[i];
-               }
-       }
-};
-
-
-//Base class to represent pointer as a Vector
-struct VBase{
-       double * const my_data;
-
-       double& operator[](int i) {
-               return my_data[i];
-       }
-
-       const double& operator[](int i) const {
-               return my_data[i];
-       }
-};
-
-//Base class providing very minimalistic expression template
-template<class B2> struct ScalarMulExpr
-{
-       const int& mul;
-       const Vector<B2>& vec;
-
-       int size() const
-       {
-               return vec.size();
-       }
-
-       double operator[](int i) const
-       {
-               return vec[i]*mul;
-       }
-
-       ScalarMulExpr(const Vector<B2>& vec_, const int& m)
-       :mul(m),vec(vec_)
-       {
-       }
-};
-
-//Allow vector to be multiplied by a scalar
-template<class B2>
-Vector<ScalarMulExpr<B2> > operator*(const Vector<B2>& lhs, const int& rhs)
-{
-       return ScalarMulExpr<B2>(lhs, rhs);
-}
-
-//Test function producing suboptimal asm code
-void test(const Vector<>& in, Vector<>& out, int i)
-{
-       out=in*1*1*1*1*1*1*1*1*1*1*1;
-}
-
-// There should be a single store remaining, inside the loops.  All
-// dead stores to unused temporaries should have been removed.
-
-// { dg-final { scan-tree-dump-times "VDEF" 1 "optimized" } }
-// { dg-final { cleanup-tree-dump "optimized" } }

diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c
index c80d9c9b74a47d5e34d2cf26d675924ea39cde91..285d08c66c66c67c893497a0c5e2e52a08b0ded4 100644 (file)
--- a/gcc/tree-ssa-dse.c
+++ b/gcc/tree-ssa-dse.c
@@ -94,7 +94,7 @@ dse_possible_dead_store_p (gimple stmt, gimple *use_stmt)
   temp = stmt;
   do
     {
-      gimple use_stmt, defvar_def;
+      gimple use_stmt;
       imm_use_iterator ui;
       bool fail = false;
       tree defvar;
@@ -108,7 +108,6 @@ dse_possible_dead_store_p (gimple stmt, gimple *use_stmt)
        defvar = PHI_RESULT (temp);
       else
        defvar = gimple_vdef (temp);
-      defvar_def = temp;
       temp = NULL;
       FOR_EACH_IMM_USE_STMT (use_stmt, ui, defvar)
        {
@@ -140,14 +139,7 @@ dse_possible_dead_store_p (gimple stmt, gimple *use_stmt)
                  fail = true;
                  BREAK_FROM_IMM_USE_STMT (ui);
                }
-             /* Do not consider the PHI as use if it dominates the 
-                stmt defining the virtual operand we are processing,
-                we have processed it already in this case.  */
-             if (gimple_bb (defvar_def) != gimple_bb (use_stmt)
-                 && !dominated_by_p (CDI_DOMINATORS,
-                                     gimple_bb (defvar_def),
-                                     gimple_bb (use_stmt)))
-               temp = use_stmt;
+             temp = use_stmt;
            }
          /* If the statement is a use the store is not dead.  */
          else if (ref_maybe_used_by_stmt_p (use_stmt,