diff options
| author | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-18 00:30:42 +0000 |
|---|---|---|
| committer | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-18 00:30:42 +0000 |
| commit | 195ac7b203a48a4f230dc3b977641e9a4e8139db (patch) | |
| tree | 4f410dd0bdda624ca5156b97bac72b6bc61f424e | |
| parent | a1b366154c109434bcf0fc8920f739d36fde3acf (diff) | |
2018-01-17 Harald Anlauf <anlauf@gmx.de>
Backport from mainline
PR fortran/83874
* decl.c (add_init_expr_to_sym): Do not dereference NULL pointer.
2018-01-17 Harald Anlauf <anlauf@gmx.de>
Backport from mainline
PR fortran/83874
* gfortran.dg/pr83874.f90: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256829 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr83874.f90 | 19 |
4 files changed, 33 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0d1607d2ddda..14cc03a02151 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,4 +1,10 @@ -2012-01-13 Steven G. Kargl <kargl@gcc.gnu.org> +2018-01-17 Harald Anlauf <anlauf@gmx.de> + + Backport from mainline + PR fortran/83874 + * decl.c (add_init_expr_to_sym): Do not dereference NULL pointer. + +2018-01-13 Steven G. Kargl <kargl@gcc.gnu.org> Backport from mainline PR fortran/78814 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 1cbf23819a94..4ccaa4c8d1a7 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1692,7 +1692,7 @@ 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) + if (init->ts.u.cl && init->ts.u.cl->length) { const gfc_expr *length = init->ts.u.cl->length; if (length->expr_type != EXPR_CONSTANT) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f674940a6a90..d098f41ac392 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-01-17 Harald Anlauf <anlauf@gmx.de> + + Backport from mainline + PR fortran/83874 + * gfortran.dg/pr83874.f90: New test. + 2018-01-17 Richard Biener <rguenther@suse.de> Backport from mainline diff --git a/gcc/testsuite/gfortran.dg/pr83874.f90 b/gcc/testsuite/gfortran.dg/pr83874.f90 new file mode 100644 index 000000000000..d1bdc97b783d --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr83874.f90 @@ -0,0 +1,19 @@ +! { dg-do run } +! PR fortran/83874 +! There was an ICE while initializing the character arrays +! +! Contributed by Harald Anlauf <anlauf@gmx.de> +! +program charinit + implicit none + type t + character(len=1) :: name + end type t + type(t), parameter :: z(2)= [ t ('a'), t ('b') ] + character(len=1), parameter :: names1(*) = z% name + character(len=*), parameter :: names2(2) = z% name + character(len=*), parameter :: names3(*) = z% name + if (.not. (names1(1) == "a" .and. names1(2) == "b")) call abort () + if (.not. (names2(1) == "a" .and. names2(2) == "b")) call abort () + if (.not. (names3(1) == "a" .and. names3(2) == "b")) call abort () +end program charinit |