From: Roger Sayle <roger@eyesopen.com>
Date: Sat, 4 Mar 2006 02:40:45 +0000 (+0000)
Subject: dependency.c (gfc_check_element_vs_element): Revert last change.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=636ffc571b3addf382dc6f5b9cd6c84fd798f051;p=gcc.git

dependency.c (gfc_check_element_vs_element): Revert last change.


	* dependency.c (gfc_check_element_vs_element): Revert last change.

	* gfortran.dg/dependency_9.f90: Remove for the time being.

From-SVN: r111703
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4edafa6f995..4e4b241f488 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-03  Roger Sayle  <roger@eyesopen.com>
+
+	* dependency.c (gfc_check_element_vs_element): Revert last change.
+
 2006-03-03  Roger Sayle  <roger@eyesopen.com>
 
 	* dependency.c (gfc_check_element_vs_element): Consider two
diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c
index 129caa361ad..187b2077716 100644
--- a/gcc/fortran/dependency.c
+++ b/gcc/fortran/dependency.c
@@ -739,14 +739,8 @@ gfc_check_element_vs_element (gfc_ref * lref, gfc_ref * rref, int n)
   i = gfc_dep_compare_expr (r_start, l_start);
   if (i == 0)
     return GFC_DEP_EQUAL;
-  /* Treat two scalar variables as potentially equal.  This allows
-     us to prove that a(i,:) and a(j,:) have no dependency.  See
-     Gerald Roth, "Evaluation of Array Syntax Dependence Analysis",
-     Proceedings of the International Conference on Parallel and
-     Distributed Processing Techniques and Applications (PDPTA2001),
-     Las Vegas, Nevada, June 2001.  This used to be GFC_DEP_OVERLAP.  */
   if (i == -2)
-    return GFC_DEP_EQUAL;
+    return GFC_DEP_OVERLAP;
   return GFC_DEP_NODEP;
 }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b3dfc1ac07f..b74f6d14795 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-04  Roger Sayle  <roger@eyesopen.com>
+
+	* gfortran.dg/dependency_9.f90: Remove for the time being.
+
 2006-03-04  Krister Walfridsson  <cato@df.lth.se>
 
 	* objc.dg/bad-receiver-type.m: Add space before bracket in dg
diff --git a/gcc/testsuite/gfortran.dg/dependency_9.f90 b/gcc/testsuite/gfortran.dg/dependency_9.f90
deleted file mode 100644
index d1f6f5e3fed..00000000000
--- a/gcc/testsuite/gfortran.dg/dependency_9.f90
+++ /dev/null
@@ -1,13 +0,0 @@
-! { dg-do compile }
-! { dg-options "-O2 -fdump-tree-original" }
-subroutine foo(a,i,j)
-  integer, dimension (4,4) :: a
-  integer :: i
-  integer :: j
-
-  where (a(i,:) .ne. 0)
-    a(j,:) = 1
-  endwhere
-end subroutine
-! { dg-final { scan-tree-dump-times "malloc" 0 "original" } }
-! { dg-final { cleanup-tree-dump "original" } }