aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorRoger Sayle <roger@eyesopen.com>2006-03-04 02:40:45 +0000
committerRoger Sayle <sayle@gcc.gnu.org>2006-03-04 02:40:45 +0000
commit636ffc571b3addf382dc6f5b9cd6c84fd798f051 (patch)
tree9c3b23bb499a01fd8085ed493ec3aa8a73139b9a /gcc/fortran
parent32b830e773a37dde8aea25f514a1fb26161bece1 (diff)
downloadgcc-636ffc571b3addf382dc6f5b9cd6c84fd798f051.zip
gcc-636ffc571b3addf382dc6f5b9cd6c84fd798f051.tar.gz
gcc-636ffc571b3addf382dc6f5b9cd6c84fd798f051.tar.bz2
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
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog4
-rw-r--r--gcc/fortran/dependency.c8
2 files changed, 5 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4edafa6..4e4b241 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,9 @@
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
unordered scalar subscripts as (potentially) equal.
diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c
index 129caa3..187b207 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;
}