diff options
| author | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-04-22 23:12:30 +0000 |
|---|---|---|
| committer | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-04-22 23:12:30 +0000 |
| commit | 2600028ade3fc5036127f074b549bb8b0a0088a9 (patch) | |
| tree | 78552113beb5adc057e77d4612335cb8cf368271 /gcc | |
| parent | 70dc19c6ad5b9a789cf382fa2e064b84c2d01ec0 (diff) | |
2015-04-22 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/65429
* decl.c (add_init_expr_to_sym): Set the length type parameter.
PR fortran/65429
* gfortran.dg/pr65429.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@222343 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr65429.f90 | 19 |
4 files changed, 30 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5896eeb392b..350fd72fcd0 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -2,6 +2,11 @@ * GCC 5.1.0 released. +2015-04-22 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/65429 + * decl.c (add_init_expr_to_sym): Set the length type parameter. + 2015-04-10 Tobias Burnus <burnus@net-b.de> * trans-stmt.c (gfc_trans_lock_unlock): Implement -fcoarray=lib diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 037a8cc47c3..0c15fb99036 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1404,9 +1404,7 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus) } else if (init->expr_type == EXPR_ARRAY) { - gfc_constructor *c; - c = gfc_constructor_first (init->value.constructor); - clen = c->expr->value.character.length; + clen = mpz_get_si (init->ts.u.cl->length->value.integer); sym->ts.u.cl->length = gfc_get_int_expr (gfc_default_integer_kind, NULL, clen); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ce90e41444c..e7b520b1d2b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-04-22 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/65429 + * gfortran.dg/pr65429.f90: New test. + 2015-04-22 Bin Cheng <bin.cheng@arm.com> Backport from trunk r222255 diff --git a/gcc/testsuite/gfortran.dg/pr65429.f90 b/gcc/testsuite/gfortran.dg/pr65429.f90 new file mode 100644 index 00000000000..505413c0b49 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr65429.f90 @@ -0,0 +1,19 @@ +! { dg-do run } +! PR fortran/65429 +program foo + + implicit none + + character(*), parameter :: s(*) = [ character(5) :: 'abcde', 'fghij' ] + character(*), parameter :: t(*) = [ character(31) :: ] + character(*), parameter :: u(*) = [ 'qwerty', 'asdfgh', 'zxcvbn'] + character(*), parameter :: v(*) = ['',''] + + if ((size(s) /= 2).or.(len(s)/=5)) call abort + if ((size(t) /= 0).or.(len(t)/=31)) call abort + if ((size(u) /= 3).or.(len(u)/=6)) call abort + if ((size(v) /= 2).or.(len(v)/=0)) call abort + if ((s(1)/='abcde').or.(s(2)/='fghij')) call abort + if ((u(1)/='qwerty').or.(u(2)/='asdfgh').or.(u(3)/='zxcvbn')) call abort + +end program foo |