Please find attached patch for PR93604.
gcc/fortran/ChangeLog
Steven G. Kargl <ka...@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.
gcc/testsuite/ChangeLog
Mark Eggleston <mark.eggles...@codethink.com>
PR fortran/93604
* gfortran.dg/pr93604.f90 : New test.
OK to commit?
--
https://www.codethink.co.uk/privacy.html
>From b4bd5742d842c860da5b35955301e3c1a1e06160 Mon Sep 17 00:00:00 2001
From: Mark Eggleston <markeggles...@gcc.gnu.org>
Date: Thu, 6 Feb 2020 13:42:33 +0000
Subject: [PATCH] [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 <ka...@gcc.gnu.org>.
Test case added later.
gcc/fortran/ChangeLog
* 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
* gfortran.dg/pr93604.f90 : New test.
---
gcc/fortran/decl.c | 16 ++++++++++++++++
gcc/testsuite/gfortran.dg/pr93604.f90 | 10 ++++++++++
2 files changed, 26 insertions(+)
create mode 100644 gcc/testsuite/gfortran.dg/pr93604.f90
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/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
+
--
2.11.0
