From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 3 May 2011 16:33:09 +0000 (+0200)
Subject: backport: re PR c/48685 (ICE in gimplify_expr, at gimplify.c:7034)
X-Git-Tag: releases/gcc-4.5.4~669
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b799571e649a1606f08ec8c196d49465f6d4a90;p=thirdparty%2Fgcc.git

backport: re PR c/48685 (ICE in gimplify_expr, at gimplify.c:7034)

	Backport from mainline
	2011-04-23  Jakub Jelinek  <jakub@redhat.com>

	PR c/48685
	* fold-const.c (fold_convert_loc): Add NOP_EXPR when casting
	to VOID_TYPE even around MODIFY_EXPR.

	* gcc.dg/pr48685.c: New test.

From-SVN: r173324
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 434c4ca1dcf5..a67888f9965f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-03  Jakub Jelinek  <jakub@redhat.com>
+
+	Backport from mainline
+	2011-04-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/48685
+	* fold-const.c (fold_convert_loc): Add NOP_EXPR when casting
+	to VOID_TYPE even around MODIFY_EXPR.
+
 2011-05-02  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
 	PR middle-end/43085
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 799a3cb41d24..cd207d98200e 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -2784,8 +2784,6 @@ fold_convert_loc (location_t loc, tree type, tree arg)
 
     case VOID_TYPE:
       tem = fold_ignored_result (arg);
-      if (TREE_CODE (tem) == MODIFY_EXPR)
-	goto fold_convert_exit;
       return fold_build1_loc (loc, NOP_EXPR, type, tem);
 
     default:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 62656be1d4fd..0bacbf0c652b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-03  Jakub Jelinek  <jakub@redhat.com>
+
+	Backport from mainline
+	2011-04-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/48685
+	* gcc.dg/pr48685.c: New test.
+
 2011-04-27  Jason Merrill  <jason@redhat.com>
 
 	* g++.dg/parse/ambig6.C: New.
diff --git a/gcc/testsuite/gcc.dg/pr48685.c b/gcc/testsuite/gcc.dg/pr48685.c
new file mode 100644
index 000000000000..36df0cc5f313
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr48685.c
@@ -0,0 +1,11 @@
+/* PR c/48685 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int
+main ()
+{
+  int v = 1;
+  (void) (1 == 2 ? (void) 0 : (v = 0));
+  return v;
+}