diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/data.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr78571.f90 | 9 |
4 files changed, 24 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 7acc4c6..b48f11c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-06-08 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/78571 + * data.c (create_character_initializer): Return early if type is + incompatible with CHARACTER. + 2018-06-07 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/86045 diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c index 780a5ad..d837e15 100644 --- a/gcc/fortran/data.c +++ b/gcc/fortran/data.c @@ -107,7 +107,10 @@ create_character_initializer (gfc_expr *init, gfc_typespec *ts, HOST_WIDE_INT len, start, end, tlen; gfc_char_t *dest; bool alloced_init = false; - + + if (init && init->ts.type != BT_CHARACTER) + return NULL; + gfc_extract_hwi (ts->u.cl->length, &len); if (init == NULL) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3b3bc5a..a4d18b3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-06-08 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/78571 + * gfortran.dg/pr78571.f90: New test. + 2018-06-08 Peter Bergner <bergner@vnet.ibm.com> PR target/85755 diff --git a/gcc/testsuite/gfortran.dg/pr78571.f90 b/gcc/testsuite/gfortran.dg/pr78571.f90 new file mode 100644 index 0000000..16b07ab --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr78571.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! PR fortran/78571 +program p + type t + character :: c + end type + character :: x = t('a') ! { dg-error "convert TYPE" } + data x /'b'/ +end |