From: Mark Eggleston <markeggleston@gcc.gnu.org>
Date: Wed, 10 Jun 2020 15:18:23 +0000 (+0100)
Subject: Fortran  :  ICE in gfc_validate_kind PR95586
X-Git-Tag: basepoints/gcc-12~6663
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=384aa890255dc01ba6d6529b127975c2c9a49a3c;p=thirdparty%2Fgcc.git

Fortran  :  ICE in gfc_validate_kind PR95586

Report syntax error for invalid letter-spec in IMPLICIT statements
for derived types and not an ICE.

Original patch by Steve Kargl.  Added test cases based on those
provided by G. Steinmetz  in the PR.

2020-06-23  Steven G. Kargl  <kargl@gcc.gnu.org>

gcc/fortran/

	PR fortran/95586
	* decl.c (gfc_match_implicit): Only perform else branch if
	the type spect is not BT_DERIVED.

2020-06-23  Mark Eggleston  <markeggleston@gcc.gnu.org>

gcc/testsuite/

	PR fortran/95586
	* gfortran.dg/pr95586_1.f90: New test.
	* gfortran.dg/pr95586_2.f90: New test.
---

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index c8a98537e876..c27cfacf2e4e 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -4827,7 +4827,7 @@ gfc_match_implicit (void)
       /* Last chance -- check <TYPE> <SELECTOR> (<RANGE>).  */
       if (ts.type == BT_CHARACTER)
 	m = gfc_match_char_spec (&ts);
-      else
+      else if (ts.type != BT_DERIVED)
 	{
 	  m = gfc_match_kind_spec (&ts, false);
 	  if (m == MATCH_NO)
diff --git a/gcc/testsuite/gfortran.dg/pr95586_1.f90 b/gcc/testsuite/gfortran.dg/pr95586_1.f90
new file mode 100644
index 000000000000..009eb3e88f01
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr95586_1.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+!
+
+program test
+  implicit type(t) (1)  ! { dg-error "Syntax error" }
+  type t
+  end type
+end program
+
diff --git a/gcc/testsuite/gfortran.dg/pr95586_2.f90 b/gcc/testsuite/gfortran.dg/pr95586_2.f90
new file mode 100644
index 000000000000..81ea6e9fa56b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr95586_2.f90
@@ -0,0 +1,11 @@
+! { dg-do compile }
+!
+
+program test
+  integer, parameter :: n1 = 1
+  implicit type(t) (n1)  ! { dg-error "Syntax error" }
+  type t
+  end type
+end program
+
+