diff mbox series

Fortran: Fix ICE in argument_rank_mismatch [PR103287]

Message ID a1c6c933-1e47-60b5-a506-45becbd75574@codesourcery.com
State New
Headers
Series Fortran: Fix ICE in argument_rank_mismatch [PR103287] |

Commit Message

Sandra Loosemore Jan. 5, 2022, 9:34 p.m. UTC 
  One of my previous TS29113-related patches from last fall introduced an 
ICE due to a bogus assertion.  This is the fix Steve suggested in the 
issue, bundled with the test cases, regression-tested, etc.  OK to check in?

-Sandra

Comments

Harald Anlauf Jan. 6, 2022, 7:47 p.m. UTC | #1 
Am 05.01.22 um 22:34 schrieb Sandra Loosemore:
> One of my previous TS29113-related patches from last fall introduced an
> ICE due to a bogus assertion.  This is the fix Steve suggested in the
> issue, bundled with the test cases, regression-tested, etc.  OK to check
> in?

OK.

> -Sandra

Thanks,
Harald
diff mbox series

Patch

commit beaae3933ef62e4d52ec22c14a308295c0794683
Author: Sandra Loosemore <sandra@codesourcery.com>
Date:   Wed Jan 5 13:18:10 2022 -0800

    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 4be9583..0fd881d 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 0000000..aeca52f
--- /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 0000000..0e724b8
--- /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