From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 12 Jan 2010 23:09:00 +0000 (+0000)
Subject: re PR c/42708 (ICE in gimplify_expr, at gimplify.c:6993)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e616f54d28182c80f9bfe10174a2a04befae62df;p=gcc.git

re PR c/42708 (ICE in gimplify_expr, at gimplify.c:6993)

	PR c/42708
	* c-typeck.c (build_c_cast): Fold value cast to union type before
	wrapping it in a CONSTRUCTOR.

testsuite:
	* gcc.c-torture/compile/pr42708-1.c: New test.

From-SVN: r155846
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 256e1d085f2..315ebee026f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-12  Joseph Myers  <joseph@codesourcery.com>
+
+	PR c/42708
+	* c-typeck.c (build_c_cast): Fold value cast to union type before
+	wrapping it in a CONSTRUCTOR.
+
 2010-01-12  Jakub Jelinek  <jakub@redhat.com>
 
 	PR rtl-optimization/42699
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index dbaddd68466..17bdbf92b3b 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -4429,10 +4429,14 @@ build_c_cast (location_t loc, tree type, tree expr)
       if (field)
 	{
 	  tree t;
+	  bool maybe_const = true;
 
 	  pedwarn (loc, OPT_pedantic, "ISO C forbids casts to union type");
-	  t = digest_init (loc, type,
-			   build_constructor_single (type, field, value),
+	  t = c_fully_fold (value, false, &maybe_const);
+	  t = build_constructor_single (type, field, t);
+	  if (!maybe_const)
+	    t = c_wrap_maybe_const (t, true);
+	  t = digest_init (loc, type, t,
 			   NULL_TREE, false, true, 0);
 	  TREE_CONSTANT (t) = TREE_CONSTANT (value);
 	  return t;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4bdc4819385..ae31eae0e36 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-12  Joseph Myers  <joseph@codesourcery.com>
+
+	PR c/42708
+	* gcc.c-torture/compile/pr42708-1.c: New test.
+
 2010-01-12  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/42662
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr42708-1.c b/gcc/testsuite/gcc.c-torture/compile/pr42708-1.c
new file mode 100644
index 00000000000..9124a85b905
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr42708-1.c
@@ -0,0 +1,10 @@
+typedef __SIZE_TYPE__ size_t;
+void *malloc(size_t);
+typedef union YYSTYPE {
+    char *id;
+}  YYSTYPE;
+extern YYSTYPE yylval;
+void yylex (int b)
+{
+  yylval = (YYSTYPE) (b ? 0 : (char *) malloc (4));
+}