aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-12-20 19:46:12 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2008-12-20 19:46:12 +0100
commitfb3e178a78e0cfef9146dc17beb69ae53ed64616 (patch)
treea561d1d4957ce2ac0cd8556dd57969d83b2278bd /gcc
parent3ce1b2de2504c2cb2918c0e0c851eb15a873d7c4 (diff)
downloadgcc-fb3e178a78e0cfef9146dc17beb69ae53ed64616.zip
gcc-fb3e178a78e0cfef9146dc17beb69ae53ed64616.tar.gz
gcc-fb3e178a78e0cfef9146dc17beb69ae53ed64616.tar.bz2
re PR c++/36921 (warning "comparison does not have mathematical meaning" is not correct for overloaded operators that do not return boolean)
PR c++/36921 * c-common.c (warn_about_parentheses): Remove ARG_UNUSED from arg_left. Don't warn about X<=Y<=Z if comparison's type isn't integral. * g++.dg/warn/pr36921.C: New. Co-Authored-By: Manuel López-Ibáñez <manu@gcc.gnu.org> From-SVN: r142849
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c-common.c8
-rw-r--r--gcc/cp/ChangeLog8
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/g++.dg/warn/pr36921.C27
4 files changed, 46 insertions, 3 deletions
diff --git a/gcc/c-common.c b/gcc/c-common.c
index e83b58e..d08a25b 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -8059,7 +8059,7 @@ warn_array_subscript_with_type_char (tree index)
void
warn_about_parentheses (enum tree_code code,
- enum tree_code code_left, tree ARG_UNUSED (arg_left),
+ enum tree_code code_left, tree arg_left,
enum tree_code code_right, tree arg_right)
{
if (!warn_parentheses)
@@ -8169,9 +8169,11 @@ warn_about_parentheses (enum tree_code code,
default:
if (TREE_CODE_CLASS (code) == tcc_comparison
&& ((TREE_CODE_CLASS (code_left) == tcc_comparison
- && code_left != NE_EXPR && code_left != EQ_EXPR)
+ && code_left != NE_EXPR && code_left != EQ_EXPR
+ && INTEGRAL_TYPE_P (TREE_TYPE (arg_left)))
|| (TREE_CODE_CLASS (code_right) == tcc_comparison
- && code_right != NE_EXPR && code_right != EQ_EXPR)))
+ && code_right != NE_EXPR && code_right != EQ_EXPR
+ && INTEGRAL_TYPE_P (TREE_TYPE (arg_right)))))
warning (OPT_Wparentheses, "comparisons like %<X<=Y<=Z%> do not "
"have their mathematical meaning");
return;
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ad0506a..19af86c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-20 Jakub Jelinek <jakub@redhat.com>
+ Manuel López-Ibáñez <manu@gcc.gnu.org>
+
+ PR c++/36921
+ * c-common.c (warn_about_parentheses): Remove ARG_UNUSED from
+ arg_left. Don't warn about X<=Y<=Z if comparison's type isn't
+ integral.
+
2008-12-19 Jakub Jelinek <jakub@redhat.com>
PR c++/38577
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fd9e537..11feb22 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-20 Jakub Jelinek <jakub@redhat.com>
+ Manuel López-Ibáñez <manu@gcc.gnu.org>
+
+ PR c++/36921
+ * g++.dg/warn/pr36921.C: New.
+
2008-12-19 Joel Sherrill <joel.sherrill@oarcorp.com>
* lib/target-supports.exp: Add *-*-rtems* to list
diff --git a/gcc/testsuite/g++.dg/warn/pr36921.C b/gcc/testsuite/g++.dg/warn/pr36921.C
new file mode 100644
index 0000000..7393669
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/pr36921.C
@@ -0,0 +1,27 @@
+/* PR 36921: comparison operator can be overloaded. Do not emit
+ warnings in such case.
+ { dg-do compile }
+ { dg-options "-Wparentheses" }
+*/
+struct A {};
+A operator<(A, A) { return A(); }
+A operator>(A, A) { return A(); }
+A operator<=(A, A) { return A(); }
+A operator>=(A, A) { return A(); }
+A operator==(A, A) { return A(); }
+A operator!=(A, A) { return A(); }
+
+int main() {
+ A() < A() < A(); // should not emit warning
+ 1 < 2 < 3; // { dg-warning "mathematical meaning" "parentheses" }
+ A() > A() > A(); // should not emit warning
+ 1 > 2 > 3; // { dg-warning "mathematical meaning" "parentheses" }
+ A() <= A() <= A(); // should not emit warning
+ 1 <= 2 <= 3; // { dg-warning "mathematical meaning" "parentheses" }
+ A() >= A() >= A(); // should not emit warning
+ 1 >= 2 >= 3; // { dg-warning "mathematical meaning" "parentheses" }
+
+ A() == A() < A (); // { dg-warning "suggest parentheses" "parentheses" }
+ A() < A() != A (); // { dg-warning "suggest parentheses" "parentheses" }
+ return 0;
+}