Fix PR42180.

2009-12-18  Sebastian Pop  <sebastian.pop@amd.com>

	PR middle-end/42180
	* graphite-sese-to-poly.c (follow_ssa_with_commutative_ops): Handle
	GIMPLE_CALL.

	* testsuite/gfortran.dg/graphite/pr42180.f90: Add compile flags.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155423 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index ae3369e..09af72b 100644 (file)
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,9 +1,23 @@
 2009-12-18  Sebastian Pop  <sebastian.pop@amd.com>
 
+       Revert patch fixing PR middle-end/42221.
+
+2009-12-18  Sebastian Pop  <sebastian.pop@amd.com>
+
+       PR middle-end/42180
+       * graphite-sese-to-poly.c (follow_ssa_with_commutative_ops): Handle
+       GIMPLE_CALL.
+
+       * testsuite/gfortran.dg/graphite/pr42180.f90: Add compile flags.
+
+2009-12-18  Sebastian Pop  <sebastian.pop@amd.com>
+
        PR middle-end/42180
        * graphite-sese-to-poly.c (split_reduction_stmt): Do not split blocks
        that contain only one statement.
 
+       * testsuite/gfortran.dg/graphite/pr42180.f90: New.
+
 2009-12-17  Sebastian Pop  <sebastian.pop@amd.com>
 
        PR middle-end/42393

diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 5999a65..70827a9 100644 (file)
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -2501,7 +2501,8 @@ follow_ssa_with_commutative_ops (tree arg, tree lhs)
 
   stmt = SSA_NAME_DEF_STMT (arg);
 
-  if (gimple_code (stmt) == GIMPLE_NOP)
+  if (gimple_code (stmt) == GIMPLE_NOP
+      || gimple_code (stmt) == GIMPLE_CALL)
     return NULL;
 
   if (gimple_code (stmt) == GIMPLE_PHI)

diff --git a/gcc/testsuite/gfortran.dg/graphite/pr42180.f90 b/gcc/testsuite/gfortran.dg/graphite/pr42180.f90
index 6c8daea..523c479 100644 (file)
--- a/gcc/testsuite/gfortran.dg/graphite/pr42180.f90
+++ b/gcc/testsuite/gfortran.dg/graphite/pr42180.f90
@@ -1,3 +1,5 @@
+! { dg-options "-ffast-math -O2 -fgraphite-identity" }
+
 module mcc_m
   integer, parameter, private :: longreal = selected_real_kind(15,90)
 contains