From ba4c5da7dba6f93125f4805dcc271c750d711b59 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Wed, 1 Jan 2020 21:40:35 +0000 Subject: [PATCH] Handle REF_INQUIRY for dependency checking. 2020-01-01 Thomas Koenig PR fortran/93113 * dependency.c (gfc_dep_resolver): Handle REF_INQUIRY in switch for ref types. 2020-01-01 Thomas Koenig PR fortran/93113 * gfortran.dg/dependency_58.f90: New test. From-SVN: r279821 --- gcc/fortran/ChangeLog | 6 ++++ gcc/fortran/dependency.c | 6 ++++ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gfortran.dg/dependency_58.f90 | 33 +++++++++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/dependency_58.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e6180d97712..ba363f88261 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2020-01-01 Thomas Koenig + + PR fortran/93113 + * dependency.c (gfc_dep_resolver): Handle REF_INQUIRY in switch + for ref types. + 2020-01-01 Jakub Jelinek Update copyright years. diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c index 35932562490..f6c68409e68 100644 --- a/gcc/fortran/dependency.c +++ b/gcc/fortran/dependency.c @@ -2286,6 +2286,12 @@ gfc_dep_resolver (gfc_ref *lref, gfc_ref *rref, gfc_reverse *reverse, subsequent references also overlap. */ break; + case REF_INQUIRY: + if (lref->u.i != rref->u.i) + return 0; + + break; + default: gcc_unreachable (); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ee7003f32bc..12f934d6571 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-01-01 Thomas Koenig + + PR fortran/93113 + * gfortran.dg/dependency_58.f90: New test. + 2020-01-01 Jakub Jelinek Update copyright years. diff --git a/gcc/testsuite/gfortran.dg/dependency_58.f90 b/gcc/testsuite/gfortran.dg/dependency_58.f90 new file mode 100644 index 00000000000..8b156e5f52f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/dependency_58.f90 @@ -0,0 +1,33 @@ +! { dg-do run } +! { dg-additional-options "-ffrontend-optimize -Warray-temporaries" } +! PR 93113 - this used to ICE, and should not generate a temporary. +program main + integer, parameter :: n = 10 + complex, dimension(n,n) :: a, b, c + real, dimension(n,n) :: r + call random_number (r) + c%re = r + call random_number (r) + c%im = r + + a = c + b = c + b%re = a%re - 0.5 + b%im = a%im - 0.5 + a%re = a%re - 0.5 + a%im = a%im - 0.5 + if (any (a /= b)) stop 1 + b%im = a%re + a%im = a%re + if (any (a /= b)) stop 2 + a = c + b = c + b(2:n,:)%re = a(1:n-1,:)%re + a(2:n,:)%re = a(1:n-1,:)%re + if (any (a /= b)) stop 3 + a = c + b = c + b(1:n-1,:)%im = a(2:,:)%im + a(1:n-1,:)%im = a(2:,:)%im + if (any (a /= b)) stop 3 +end program main -- 2.30.2