diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 13 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr66107.f90 | 6 |
4 files changed, 29 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5d9a10df..971c348 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2016-09-21 Louis Krupp <louis.krupp@zoho.com> + + PR fortran/66107 + * decl.c (add_init_expr_to_sym): Catch variable character length + in parameter array. + 2016-09-21 Paul Thomas <pault@gcc.gnu.org> PR fortran/77657 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index d9fae57..2982e86 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1672,7 +1672,18 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus) else if (init->expr_type == EXPR_ARRAY) { if (init->ts.u.cl) - clen = mpz_get_si (init->ts.u.cl->length->value.integer); + { + const gfc_expr *length = init->ts.u.cl->length; + if (length->expr_type != EXPR_CONSTANT) + { + gfc_error ("Cannot initialize parameter array " + "at %L " + "with variable length elements", + &sym->declared_at); + return false; + } + clen = mpz_get_si (length->value.integer); + } else if (init->value.constructor) { gfc_constructor *c; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6a1dae9..e6480d8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-09-21 Louis Krupp <louis.krupp@zoho.com> + + PR fortran/66107 + * gfortran.dg/pr66107.f90: New test. + 2016-09-21 Ian Lance Taylor <iant@golang.org> * go.go-torture/execute/map-1.go: Replace old map deletion syntax diff --git a/gcc/testsuite/gfortran.dg/pr66107.f90 b/gcc/testsuite/gfortran.dg/pr66107.f90 new file mode 100644 index 0000000..5127efa --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr66107.f90 @@ -0,0 +1,6 @@ +! { dg-do compile } +! PR fortran/66107 +subroutine p + integer n + character(*), parameter :: z(1) = [character(len=n) :: 'x'] ! { dg-error "Cannot initialize parameter array at .1. with variable length elements" } +end subroutine |