From: kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 30 Oct 2015 18:13:50 +0000 (+0000)
Subject: 2015-10-15  Steven G. Kargl  <kargl@gcc.gnu.org>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00fff882eb09610bfd194b4c9c86d9cf982a71ff;p=thirdparty%2Fgcc.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229594 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f197ca9f0222..8b99c0349f7b 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 5a95fa4f193c..7178aafe5e1a 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 04f47e065fdb..2e741529375f 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 000000000000..753dd6fc80ce
--- /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