From 72328b3e8b89b517f9f58358e89c8cd0f26de7f2 Mon Sep 17 00:00:00 2001 From: janus Date: Sat, 23 Nov 2013 09:14:11 +0000 Subject: [PATCH] 2013-11-23 Janus Weil PR fortran/59228 * interface.c (compare_parameter): Check for array spec. 2013-11-23 Janus Weil PR fortran/59228 * gfortran.dg/asynchronous_4.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205304 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/interface.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/asynchronous_4.f90 | 22 ++++++++++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/asynchronous_4.f90 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 + + PR fortran/59228 + * interface.c (compare_parameter): Check for array spec. + 2013-11-22 Andrew MacLeod * 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 + + PR fortran/59228 + * gfortran.dg/asynchronous_4.f90: New. + 2013-11-22 Jakub Jelinek * 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 + + 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 -- 2.7.4