From: Sandra Loosemore <sandra@codesourcery.com>
Date: Wed, 5 Jan 2022 21:18:10 +0000 (-0800)
Subject: Fortran: Fix ICE in argument_rank_mismatch [PR103287]
X-Git-Tag: basepoints/gcc-13~1991
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e2771069ed0c157cca825d6af5792e94c4407c1;p=thirdparty%2Fgcc.git

Fortran: Fix ICE in argument_rank_mismatch [PR103287]

This patch removes an incorrect assertion.  A user-friendly error for this
case is already given elsewhere.

2022-01-05  Steve Kargl  <kargl@gcc.gnu.org>
	    Sandra Loosemore  <sandra@codesourcery.com>

	PR fortran/103287

	gcc/fortran/
	* interface.c (argument_rank_mismatch): Replace incorrect assertion
	with return.

	gcc/testsuite/
	* gfortran.dg/c-interop/pr103287-1.f90: new.
	* gfortran.dg/c-interop/pr103287-2.f90: new.
---

diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 4be95834def3..0fd881dec15e 100644
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -2237,7 +2237,11 @@ argument_rank_mismatch (const char *name, locus *where,
     }
   else
     {
-      gcc_assert (rank2 != -1);
+      if (rank2 == -1)
+	/* This is an assumed rank-actual passed to a function without
+	   an explicit interface, which is already diagnosed in
+	   gfc_procedure_use.  */
+	return;
       if (rank1 == 0)
 	gfc_error_opt (0, "Rank mismatch between actual argument at %L "
 		       "and actual argument at %L (scalar and rank-%d)",
diff --git a/gcc/testsuite/gfortran.dg/c-interop/pr103287-1.f90 b/gcc/testsuite/gfortran.dg/c-interop/pr103287-1.f90
new file mode 100644
index 000000000000..aeca52f01da1
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/c-interop/pr103287-1.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+
+subroutine g
+   call s([1])
+end
+subroutine h(x)
+   integer, pointer :: x(..)
+   call s(x) ! { dg-error "Assumed-rank argument requires an explicit interface" } 
+end
diff --git a/gcc/testsuite/gfortran.dg/c-interop/pr103287-2.f90 b/gcc/testsuite/gfortran.dg/c-interop/pr103287-2.f90
new file mode 100644
index 000000000000..0e724b8fa476
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/c-interop/pr103287-2.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+
+subroutine g
+   call s(1)
+end
+subroutine h(x)
+   integer, pointer :: x(..)
+   call s(x) ! { dg-error "Assumed-rank argument requires an explicit interface" } 
+end