diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2019-08-14 04:22:31 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2019-08-14 04:22:31 +0000 |
| commit | ade8fdbbfd98aafdc12585885dea60460fea0a26 (patch) | |
| tree | eeec6ca2229ce463b70f5e66aafebc5978143959 /gcc | |
| parent | 5747e0c0e1bce0df39ab7ac342162ecdc6e1343d (diff) | |
| download | gcc-ade8fdbbfd98aafdc12585885dea60460fea0a26.zip gcc-ade8fdbbfd98aafdc12585885dea60460fea0a26.tar.gz gcc-ade8fdbbfd98aafdc12585885dea60460fea0a26.tar.bz2 | |
re PR fortran/87991 (ICE in gfc_constructor_append_expr, at fortran/constructor.c:135)
2019-08-13 Steven G. Kargl <kargl@gcc.gnu.org>
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 <kargl@gcc.gnu.org>
PR fortran/87991
* gfortran.dg/pr87991.f90: New test.
From-SVN: r274412
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 29 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr87991.f90 | 11 |
4 files changed, 41 insertions, 10 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 787c704..42cf2f5 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2019-08-13 Steven G. Kargl <kargl@gcc.gnu.org> + 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 <kargl@gcc.gnu.org> + PR fortran/88072 * misc.c (gfc_typename): Do not point to something that ought not to be pointed at. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index bd379b6..ac9192a 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -15726,8 +15726,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, @@ -15735,19 +15733,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 1147dc8..9f7f4e7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-08-13 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/87991 + * gfortran.dg/pr87991.f90: New test. + 2019-08-13 Richard Sandiford <richard.sandiford@arm.com> * gcc.target/aarch64/sve/spill_2.c: Increase iteration counts diff --git a/gcc/testsuite/gfortran.dg/pr87991.f90 b/gcc/testsuite/gfortran.dg/pr87991.f90 new file mode 100644 index 0000000..435871e --- /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 |