From: Janus Weil <janus@gcc.gnu.org>
Date: Sat, 23 Nov 2013 09:14:11 +0000 (+0100)
Subject: re PR fortran/59228 (ICE-on-invalid with assumed type and ASYNCHRONOUS)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=627b82f2143faa7f229347c463fda5968661d14f;p=gcc.git

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
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5b66a7b7e46..61c02100a56 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 0504c904b96..5a0aa267707 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 12d2c907b05..dc8909259e2 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 00000000000..ca6cd6c0265
--- /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