diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-10-30 18:13:50 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-10-30 18:13:50 +0000 |
| commit | 834e9dbb3999af9b49ba168c7e870f484504d35f (patch) | |
| tree | ca6fbe301daf557bc0ab0a08fb279eecde400ca6 | |
| parent | 99a04f4fc55931d920a27b0efb61fc46eb96a628 (diff) | |
| download | gcc-834e9dbb3999af9b49ba168c7e870f484504d35f.zip gcc-834e9dbb3999af9b49ba168c7e870f484504d35f.tar.gz gcc-834e9dbb3999af9b49ba168c7e870f484504d35f.tar.bz2 | |
re PR fortran/51993 (Erroneous type component initialization leads to internal compiler error)
2015-10-15 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/51993
* decl.c (gfc_set_constant_character_len): Convert gcc_assert into an
if-statement causing an early return leads to valid error message.
2015-10-15 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/51993
* gfortran.dg/pr51993.f90: New test.
From-SVN: r229594
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr51993.f90 | 8 |
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f197ca9..8b99c03 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2015-10-15 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/51993 + * decl.c (gfc_set_constant_character_len): Convert gcc_assert into an + if-statement causing an early return leads to valid error message. + 2015-10-30 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/36192 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 5a95fa4..7178aaf 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -1293,7 +1293,9 @@ gfc_set_constant_character_len (int len, gfc_expr *expr, int check_len) int slen; gcc_assert (expr->expr_type == EXPR_CONSTANT); - gcc_assert (expr->ts.type == BT_CHARACTER); + + if (expr->ts.type != BT_CHARACTER) + return; slen = expr->value.character.length; if (len != slen) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 04f47e0..2e74152 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-10-15 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/51993 + * gfortran.dg/pr51993.f90: New test. + 2015-10-30 Vladimir Makarov <vmakarov@redhat.com> PR rtl-optimization/68106 diff --git a/gcc/testsuite/gfortran.dg/pr51993.f90 b/gcc/testsuite/gfortran.dg/pr51993.f90 new file mode 100644 index 0000000..753dd6f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr51993.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/51993 +! Code contributed by Sebastien Bardeau <bardeau at iram dot fr> +module mymod + type :: mytyp + character(len=3) :: a = .true. ! { dg-error "convert LOGICAL" } + end type mytyp +end module mymod |