public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/vendors/ibm/heads/perf)] fortran: ICE in gfc_conv_constant_to_tree PR93604
@ 2020-03-19 5:49 Jiu Fu Guo
0 siblings, 0 replies; only message in thread
From: Jiu Fu Guo @ 2020-03-19 5:49 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:c77b6f95e014ad1f6654683ff56f9508fe7f268d
commit c77b6f95e014ad1f6654683ff56f9508fe7f268d
Author: Mark Eggleston <markeggleston@gcc.gnu.org>
Date: Mon Feb 24 14:33:35 2020 +0000
fortran: ICE in gfc_conv_constant_to_tree PR93604
Using a BOZ constant in a structure constructor in a data statement
resulted in an ICE. Output a "BOZ literal constant cannot appear in
a structure constructor" error message instead.
Original patch provided by Steven G. Kargl <kargl@gcc.gnu.org>.
Test case added later.
gcc/fortran/ChangeLog
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.
gcc/testsuite/ChangeLog
PR fortran/93604
* gfortran.dg/pr93604.f90 : New test.
Diff:
---
gcc/fortran/ChangeLog | 8 ++++++++
gcc/fortran/decl.c | 16 ++++++++++++++++
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gfortran.dg/pr93604.f90 | 10 ++++++++++
4 files changed, 39 insertions(+)
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 94ceb5c8aa3..e25d05cf794 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 499d2429aba..7382fea03e4 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 d92e40ec279..272d4ea478c 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 00000000000..2c695d37829
--- /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
+
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-03-19 5:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-19 5:49 [gcc(refs/vendors/ibm/heads/perf)] fortran: ICE in gfc_conv_constant_to_tree PR93604 Jiu Fu Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).