summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-typeck.c2
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/pr48742.c15
4 files changed, 27 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 11ff008a395..d918080e33d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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-26 Jakub Jelinek <jakub@redhat.com>
PR debug/48768
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index fca369cd681..6ae9b4c4f0b 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -10178,7 +10178,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 45bf3e60311..c49ca1bfbdf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-27 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/48742
+ * gcc.c-torture/compile/pr48742.c: New test.
+
2011-04-26 Jason Merrill <jason@redhat.com>
* g++.dg/lookup/koenig13.C: New.
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 00000000000..0a670f3c990
--- /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));
+}