aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2015-11-14 13:54:16 -0500
committerJason Merrill <jason@gcc.gnu.org>2015-11-14 13:54:16 -0500
commit38e5f0454c22a422f0aa2e5f2ec2962baa6427ab (patch)
tree3c640f257fe207614f8d093f259bafe37e34ac0f
parente460634820cb3fce59aeed8310f1d8824ad96441 (diff)
downloadgcc-38e5f0454c22a422f0aa2e5f2ec2962baa6427ab.zip
gcc-38e5f0454c22a422f0aa2e5f2ec2962baa6427ab.tar.gz
gcc-38e5f0454c22a422f0aa2e5f2ec2962baa6427ab.tar.bz2
re PR bootstrap/68346 (Bootstrap failure on i686-linux)
PR bootstrap/68346 * call.c (build_new_op_1): Don't fold arguments to warn_tautological_cmp. From-SVN: r230382
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/call.c2
-rw-r--r--gcc/testsuite/g++.dg/warn/Wtautological-compare.C7
3 files changed, 14 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index baaabc8..b154453 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-14 Jason Merrill <jason@redhat.com>
+
+ PR bootstrap/68346
+ * call.c (build_new_op_1): Don't fold arguments to
+ warn_tautological_cmp.
+
2015-11-14 Jakub Jelinek <jakub@redhat.com>
* semantics.c (finish_omp_clauses): Don't mark
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 77c2936..8cdda62 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5741,7 +5741,7 @@ build_new_op_1 (location_t loc, enum tree_code code, int flags, tree arg1,
maybe_warn_bool_compare (loc, code, fold (arg1),
fold (arg2));
if (complain & tf_warning && warn_tautological_compare)
- warn_tautological_cmp (loc, code, fold (arg1), fold (arg2));
+ warn_tautological_cmp (loc, code, arg1, arg2);
/* Fall through. */
case PLUS_EXPR:
case MINUS_EXPR:
diff --git a/gcc/testsuite/g++.dg/warn/Wtautological-compare.C b/gcc/testsuite/g++.dg/warn/Wtautological-compare.C
new file mode 100644
index 0000000..451fd54
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wtautological-compare.C
@@ -0,0 +1,7 @@
+// PR bootstrap/68346
+// { dg-options -Wtautological-compare }
+
+bool f(unsigned u)
+{
+ return ((unsigned)(int)u == u);
+}