aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/resolve.c3
-rw-r--r--gcc/testsuite/gfortran.dg/charlen_18.f9018
2 files changed, 20 insertions, 1 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index c075d0f..11b5dbc 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -12446,7 +12446,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 0000000..5ad2874
--- /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