diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2013-11-23 10:14:11 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2013-11-23 10:14:11 +0100 |
| commit | 627b82f2143faa7f229347c463fda5968661d14f (patch) | |
| tree | 0ea54065bf2fff2f2c2cf709150b6afe1bf2152e /gcc | |
| parent | 5ed182049ba26a74641616c57829fa900aecd4e2 (diff) | |
| download | gcc-627b82f2143faa7f229347c463fda5968661d14f.zip gcc-627b82f2143faa7f229347c463fda5968661d14f.tar.gz gcc-627b82f2143faa7f229347c463fda5968661d14f.tar.bz2 | |
re PR fortran/59228 (ICE-on-invalid with assumed type and ASYNCHRONOUS)
2013-11-23 Janus Weil <janus@gcc.gnu.org>
PR fortran/59228
* interface.c (compare_parameter): Check for array spec.
2013-11-23 Janus Weil <janus@gcc.gnu.org>
PR fortran/59228
* gfortran.dg/asynchronous_4.f90: New.
From-SVN: r205304
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/interface.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/asynchronous_4.f90 | 22 |
4 files changed, 33 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5b66a7b..61c0210 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2013-11-23 Janus Weil <janus@gcc.gnu.org> + + PR fortran/59228 + * interface.c (compare_parameter): Check for array spec. + 2013-11-22 Andrew MacLeod <amacleod@redhat.com> * trans.c: Add required include files from gimple.h. diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 0504c90..5a0aa26 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -2092,7 +2092,7 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, && (actual->symtree->n.sym->attr.asynchronous || actual->symtree->n.sym->attr.volatile_) && (formal->attr.asynchronous || formal->attr.volatile_) - && actual->rank && !gfc_is_simply_contiguous (actual, true) + && actual->rank && formal->as && !gfc_is_simply_contiguous (actual, true) && ((formal->as->type != AS_ASSUMED_SHAPE && formal->as->type != AS_ASSUMED_RANK && !formal->attr.pointer) || formal->attr.contiguous)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 12d2c90..dc89092 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-11-23 Janus Weil <janus@gcc.gnu.org> + + PR fortran/59228 + * gfortran.dg/asynchronous_4.f90: New. + 2013-11-22 Jakub Jelinek <jakub@redhat.com> * c-c++-common/asan/no-redundant-instrumentation-7.c: Fix diff --git a/gcc/testsuite/gfortran.dg/asynchronous_4.f90 b/gcc/testsuite/gfortran.dg/asynchronous_4.f90 new file mode 100644 index 0000000..ca6cd6c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/asynchronous_4.f90 @@ -0,0 +1,22 @@ +! { dg-do compile } +! +! PR 59228: ICE with assumed type and ASYNCHRONOUS +! +! Contributed by Valery Weber <valeryweber@hotmail.com> + + IMPLICIT NONE + + interface + subroutine test(base) + TYPE(*), ASYNCHRONOUS :: base + end subroutine + end interface + +CONTAINS + + SUBROUTINE foo ( data ) + REAL, DIMENSION( : ), ASYNCHRONOUS :: data + CALL test ( data ) ! { dg-error "Rank mismatch in argument" } + END SUBROUTINE + +END |