re PR fortran/51993 (Erroneous type component initialization leads to internal compil...

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f197ca9f022216016081d7c590d40d14005d3820..8b99c0349f7bdc20e26a51d6e79449d56b36960b 100644 (file)
--- 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 5a95fa4f193c8c5ede074e013d5828d70c2bf2cd..7178aafe5e1a3bf1f49832a47061dfd9d0dde952 100644 (file)
--- 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 04f47e065fdb9ed1157678c964d0e58f4af8bb1e..2e741529375f145461881451374ae0056722c2aa 100644 (file)
--- 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 (file)
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