diff options
| author | Roger Sayle <roger@eyesopen.com> | 2006-03-04 02:40:45 +0000 |
|---|---|---|
| committer | Roger Sayle <sayle@gcc.gnu.org> | 2006-03-04 02:40:45 +0000 |
| commit | 636ffc571b3addf382dc6f5b9cd6c84fd798f051 (patch) | |
| tree | 9c3b23bb499a01fd8085ed493ec3aa8a73139b9a /gcc | |
| parent | 32b830e773a37dde8aea25f514a1fb26161bece1 (diff) | |
| download | gcc-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')
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/dependency.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/dependency_9.f90 | 13 |
4 files changed, 9 insertions, 20 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; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b3dfc1a..b74f6d1 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 d1f6f5e..0000000 --- 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" } } |