diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2019-11-30 15:02:50 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2019-11-30 15:02:50 +0000 |
| commit | 1fc1082929c645e1b2fec96a50ca9a47c81e0ca0 (patch) | |
| tree | 5a8a2ef77b4d2cdf21897ad1f1f8a2a41b5e931a | |
| parent | 37c402ccc8ee9d252c33951b435eada741d809b1 (diff) | |
Do not look at _data component in gfc_dep_resolver.
2019-11-30 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/91783
* dependency.c (gfc_dep_resolver): Do not look at _data
component if present.
2019-11-30 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/91783
* gfortran.dg/dependency_56.f90: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@278873 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/dependency.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/dependency_56.f90 | 14 |
4 files changed, 37 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b2673866bee..a29d4229c7e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-11-30 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/91783 + * dependency.c (gfc_dep_resolver): Do not look at _data + component if present. + 2019-11-28 Jerry DeLisle <jvdelisle@gcc.ngu.org> PR fortran/90374 diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c index 51148709766..02e4b4f7a65 100644 --- a/gcc/fortran/dependency.c +++ b/gcc/fortran/dependency.c @@ -2098,6 +2098,18 @@ gfc_dep_resolver (gfc_ref *lref, gfc_ref *rref, gfc_reverse *reverse, gfc_dependency this_dep; bool same_component = false; + /* The refs might come in mixed, one with a _data component and one + without. Look at their next reference in order to avoid an + ICE. */ + + if (lref && lref->type == REF_COMPONENT && lref->u.c.component + && strcmp (lref->u.c.component->name, "_data") == 0) + lref = lref->next; + + if (rref && rref->type == REF_COMPONENT && rref->u.c.component + && strcmp (rref->u.c.component->name, "_data") == 0) + rref = rref->next; + this_dep = GFC_DEP_ERROR; fin_dep = GFC_DEP_ERROR; /* Dependencies due to pointers should already have been identified. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ad1be1daaed..650866f58c8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-11-30 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/91783 + * gfortran.dg/dependency_56.f90: New test. + 2019-11-29 Richard Biener <rguenther@suse.de> PR tree-optimization/91003 diff --git a/gcc/testsuite/gfortran.dg/dependency_56.f90 b/gcc/testsuite/gfortran.dg/dependency_56.f90 new file mode 100644 index 00000000000..97c0c814aed --- /dev/null +++ b/gcc/testsuite/gfortran.dg/dependency_56.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } +! PR 91783 - used to cause an ICE in dependency checking. +! Test case by Gerhard Steinmetz. +program p + class(*), allocatable :: a(:) + a = [1, 2, 3] + a = f(a) +contains + function f(x) result(y) + class(*), allocatable, intent(in) :: x(:) + class(*), allocatable :: y(:) + y = x + end +end |