re PR fortran/69962 (ICE on missing parameter attribute, in gfc_set_constant_characte...

2016-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/69962
	* decl.c (gfc_set_constant_character_len):  if expr is not
	constant issue an error instead of an ICE.

2016-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/69962
	* gfortran.dg/pr69962.f90: New test.

From-SVN: r238906

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3c137ee199f67e6310fd30be73d2b98a74a10bb4..5e8e7d1b8207c839816ca093b37c111cf8553fd8 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/69962
+       * decl.c (gfc_set_constant_character_len):  if expr is not
+       constant issue an error instead of an ICE.
+
 2016-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/70006

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 7ff2f0df29767f8d0044230408480e7e5dd145c8..ae68c09f586e31e5b9084a22a883a6fbdc634077 100644 (file)
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -1495,10 +1495,14 @@ gfc_set_constant_character_len (int len, gfc_expr *expr, int check_len)
   gfc_char_t *s;
   int slen;
 
-  gcc_assert (expr->expr_type == EXPR_CONSTANT);
-
   if (expr->ts.type != BT_CHARACTER)
     return;
+ 
+  if (expr->expr_type != EXPR_CONSTANT)
+    {
+      gfc_error_now ("CHARACTER length must be a constant at %L", &expr->where);
+      return;
+    }
 
   slen = expr->value.character.length;
   if (len != slen)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6ead1195b38f2852e97b9d892c027667021c8660..73e2258fa29988e93d78c9c108f8c28024293ef9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/69962
+       * gfortran.dg/pr69962.f90: New test.
+
 2016-07-30  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/70006

diff --git a/gcc/testsuite/gfortran.dg/pr69962.f90 b/gcc/testsuite/gfortran.dg/pr69962.f90
new file mode 100644 (file)
index 0000000..2684398
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr69962.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+program p
+   integer :: n = 1
+   character(3), parameter :: x(2) = ['abc', 'xyz']
+   character(2), parameter :: y(2) = [x(2)(2:3), x(n)(1:2)] ! { dg-error "CHARACTER length must be a constant" }
+end