diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 16 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr93604.f90 | 10 |
4 files changed, 39 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 94ceb5c..e25d05c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2020-02-24 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/93604 + * decl.c (gfc_match_data) : Check whether the data expression + is a derived type and is a constructor. If a BOZ constant + is encountered in the constructor output an error and return + MATCH_ERROR. + 2020-02-24 Tobias Burnus <tobias@codesourcery.com> PR fortran/93552 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 499d242..7382fea 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -716,6 +716,22 @@ gfc_match_data (void) new_data->next = gfc_current_ns->data; gfc_current_ns->data = new_data; + /* A BOZ literal constant cannot appear in a structure constructor. + Check for that here for a data statement value. */ + if (new_data->value->expr->ts.type == BT_DERIVED + && new_data->value->expr->value.constructor) + { + gfc_constructor *c; + c = gfc_constructor_first (new_data->value->expr->value.constructor); + for (; c; c = gfc_constructor_next (c)) + if (c->expr->ts.type == BT_BOZ) + { + gfc_error ("BOZ literal constant at %L cannot appear in a " + "structure constructor", &c->expr->where); + return MATCH_ERROR; + } + } + if (gfc_match_eos () == MATCH_YES) break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d92e40e..272d4ea 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-02-20 Mark Eggleston <mark.eggleston@codethink.com> + + PR fortran/93604 + * gfortran.dg/pr93604.f90 : New test. + 2020-02-24 Jakub Jelinek <jakub@redhat.com> P1937R2 - Fixing inconsistencies between const{expr,eval} functions diff --git a/gcc/testsuite/gfortran.dg/pr93604.f90 b/gcc/testsuite/gfortran.dg/pr93604.f90 new file mode 100644 index 0000000..2c695d3 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr93604.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } + +program p + type t + integer :: a + end type + type(t) :: x + data x /t(z'1')/ ! { dg-error "cannot appear in a structure constructor" } +end + |