From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 3 May 2011 16:34:32 +0000 (+0200)
Subject: backport: re PR c/48742 (Internal error in gimplify_expr)
X-Git-Tag: releases/gcc-4.5.4~668
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f248f32506289258a0ee4d635ee0a736719f049;p=thirdparty%2Fgcc.git

backport: re PR c/48742 (Internal error in gimplify_expr)

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

	PR c/48742
	* c-typeck.c (build_binary_op): Don't wrap arguments if
	int_operands is true.

	* gcc.c-torture/compile/pr48742.c: New test.

From-SVN: r173326
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a67888f9965f..1e4307dc13d3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2011-05-03  Jakub Jelinek  <jakub@redhat.com>
 
 	Backport from mainline
+	2011-04-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/48742
+	* c-typeck.c (build_binary_op): Don't wrap arguments if
+	int_operands is true.
+
 	2011-04-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/48685
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 92b0f618f0b9..e1ba16b1fe1f 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -9800,7 +9800,7 @@ build_binary_op (location_t location, enum tree_code code,
 		warn_for_sign_compare (location, orig_op0_folded,
 				       orig_op1_folded, op0, op1,
 				       result_type, resultcode);
-	      if (!in_late_binary_op)
+	      if (!in_late_binary_op && !int_operands)
 		{
 		  if (!op0_maybe_const || TREE_CODE (op0) != INTEGER_CST)
 		    op0 = c_wrap_maybe_const (op0, !op0_maybe_const);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0bacbf0c652b..0b6e8e92f6cb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
 2011-05-03  Jakub Jelinek  <jakub@redhat.com>
 
 	Backport from mainline
+	2011-04-27  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c/48742
+	* gcc.c-torture/compile/pr48742.c: New test.
+
 	2011-04-23  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/48685
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr48742.c b/gcc/testsuite/gcc.c-torture/compile/pr48742.c
new file mode 100644
index 000000000000..0a670f3c9907
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr48742.c
@@ -0,0 +1,15 @@
+/* PR c/48742 */
+
+void baz (int);
+
+int
+foo (void)
+{
+  return 1 / 0 > 0;
+}
+
+void
+bar (void)
+{
+  baz (1 <= 2 % (3 >> 1 > 5 / 6 == 3));
+}