From: Paul Thomas <pault@gcc.gnu.org>
Date: Mon, 25 Jan 2021 10:27:51 +0000 (+0000)
Subject: Fortran: Fix deferred character lengths in array constructors [PR98517].
X-Git-Tag: releases/gcc-10.3.0~367
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=039ac05206397227b68436cd1572ac667820c915;p=thirdparty%2Fgcc.git

Fortran: Fix deferred character lengths in array constructors [PR98517].

2021-01-25  Steve Kargl  <kargl@gcc.gnu.org>

gcc/fortran
	PR fortran/98517
	* resolve.c (resolve_charlen): Check that length expression is
	present before testing for scalar/integer..

gcc/testsuite/
	PR fortran/98517
	* gfortran.dg/charlen_18.f90 : New test.

(cherry picked from commit c6b0e33febbf73abfcc2bb0e28f0b62afe3b0f2a)
---

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 2a6f648ad5f6..e5311b48c0f8 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -12378,7 +12378,8 @@ resolve_charlen (gfc_charlen *cl)
 	}
 
       /* cl->length has been resolved.  It should have an integer type.  */
-      if (cl->length->ts.type != BT_INTEGER || cl->length->rank != 0)
+      if (cl->length
+	  && (cl->length->ts.type != BT_INTEGER || cl->length->rank != 0))
 	{
 	  gfc_error ("Scalar INTEGER expression expected at %L",
 		     &cl->length->where);
diff --git a/gcc/testsuite/gfortran.dg/charlen_18.f90 b/gcc/testsuite/gfortran.dg/charlen_18.f90
new file mode 100644
index 000000000000..5ad287448b45
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/charlen_18.f90
@@ -0,0 +1,18 @@
+! { dg-do compile }
+! { dg-options "-fdec-structure" }
+!
+! Check fix for PR98517
+!
+! Contributed by Eric Reischer  <emr-gnu@hev.psu.edu>
+!
+      SUBROUTINE TEST_BUG
+      IMPLICIT NONE
+
+      CHARACTER*(*) DEF_VAL
+      PARAMETER (DEF_VAL = 'ABCDEFGH')
+
+      STRUCTURE /SOME_STRUCT/
+          CHARACTER*64    SOME_VAR /DEF_VAL/
+      END STRUCTURE
+
+      END