From: Steven G. Kargl Date: Wed, 14 Aug 2019 04:38:29 +0000 (+0000) Subject: re PR fortran/87991 (ICE in gfc_constructor_append_expr, at fortran/constructor.c... X-Git-Tag: releases/gcc-9.3.0~729 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5c39366b69c199df0a689212304ddbafbcf3d27;p=thirdparty%2Fgcc.git re PR fortran/87991 (ICE in gfc_constructor_append_expr, at fortran/constructor.c:135) 2019-08-13 Steven G. Kargl PR fortran/87991 * resolve.c (check_data_variable): data-stmt-object with pointer attribute requires a data-stmt-value with the target attribute. 2019-08-13 Steven G. Kargl PR fortran/87991 * gfortran.dg/pr87991.f90: New test. From-SVN: r274413 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9484b9992e53..ee23b3f3bba1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,10 +1,16 @@ +2019-08-13 Steven G. Kargl + + PR fortran/87991 + * resolve.c (check_data_variable): data-stmt-object with pointer + attribute requires a data-stmt-value with the target attribute. + 2013-08-13 Thomas Koenig Backport from trunk PR fortran/90563 * frontend-passes.c (insert_index): Suppress errors while simplifying the resulting expression. - + 2019-08-13 Steven G. Kargl PR fortran/88072 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index c6569d5da394..9647ef2c46a4 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -15682,8 +15682,6 @@ check_data_variable (gfc_data_variable *var, locus *where) return false; } - has_pointer = sym->attr.pointer; - if (gfc_is_coindexed (e)) { gfc_error ("DATA element %qs at %L cannot have a coindex", sym->name, @@ -15691,19 +15689,30 @@ check_data_variable (gfc_data_variable *var, locus *where) return false; } + has_pointer = sym->attr.pointer; + for (ref = e->ref; ref; ref = ref->next) { if (ref->type == REF_COMPONENT && ref->u.c.component->attr.pointer) has_pointer = 1; - if (has_pointer - && ref->type == REF_ARRAY - && ref->u.ar.type != AR_FULL) - { - gfc_error ("DATA element %qs at %L is a pointer and so must " - "be a full array", sym->name, where); - return false; - } + if (has_pointer) + { + if (ref->type == REF_ARRAY && ref->u.ar.type != AR_FULL) + { + gfc_error ("DATA element %qs at %L is a pointer and so must " + "be a full array", sym->name, where); + return false; + } + + if (values.vnode->expr->expr_type == EXPR_CONSTANT) + { + gfc_error ("DATA object near %L has the pointer attribute " + "and the corresponding DATA value is not a valid " + "initial-data-target", where); + return false; + } + } } if (e->rank == 0 || has_pointer) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e8b462ac3973..111c5ace0651 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-08-13 Steven G. Kargl + + PR fortran/87991 + * gfortran.dg/pr87991.f90: New test. + 2013-08-13 Thomas Koenig Backport from trunk diff --git a/gcc/testsuite/gfortran.dg/pr87991.f90 b/gcc/testsuite/gfortran.dg/pr87991.f90 new file mode 100644 index 000000000000..435871ec7799 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr87991.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! { dg-options "-w" } +! PR fortran/87991 +program p + type t + character(:), pointer :: c + end type + type(t) :: x + allocate (character(3) :: x%c) + data x%c /'abc'/ ! { dg-error "has the pointer attribute" } +end