diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-07-30 19:24:49 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-07-30 19:24:49 +0000 |
| commit | 7c2829d03c0d38e662f89bf7d99249ce4172fbdc (patch) | |
| tree | b4f538f9fcb1ce39640cb256c19b2e74d57ca8b1 | |
| parent | b6cb9b06f25129202a6dbe827cf4a74b23ff1dc0 (diff) | |
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@238906 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr69962.f90 | 6 |
4 files changed, 23 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3c137ee199f..5e8e7d1b820 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 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 * io.c (gfc_resolve_dt): Use correct locus. * resolve.c (resolve_branch): Ditto. diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 7ff2f0df297..ae68c09f586 100644 --- 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 6ead1195b38..73e2258fa29 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 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 * gfortran.dg/pr70006.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/pr69962.f90 b/gcc/testsuite/gfortran.dg/pr69962.f90 new file mode 100644 index 00000000000..2684398ee31 --- /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 |