aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2015-07-23 18:57:25 +0000
committerMarek Polacek <mpolacek@gcc.gnu.org>2015-07-23 18:57:25 +0000
commit04e4dbd07cd613e086488a735d25e05ae939e117 (patch)
treec034e8d0c75394de7f51b9d77ca07b706cf8c3cd /gcc
parent45952786d4d9f5aa4c2ce0aaa161b90b6f52c706 (diff)
downloadgcc-04e4dbd07cd613e086488a735d25e05ae939e117.zip
gcc-04e4dbd07cd613e086488a735d25e05ae939e117.tar.gz
gcc-04e4dbd07cd613e086488a735d25e05ae939e117.tar.bz2
re PR c++/66572 (Bogus Wlogical-op warning for operands coming from template instantiations)
PR c++/66572 * pt.c (tsubst_copy_and_build): Add warn_logical_op sentinel. * g++.dg/warn/Wlogical-op-2.C: New test. From-SVN: r226120
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/pt.c1
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/warn/Wlogical-op-2.C30
4 files changed, 41 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7626492..51766ea 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-23 Marek Polacek <polacek@redhat.com>
+
+ PR c++/66572
+ * pt.c (tsubst_copy_and_build): Add warn_logical_op sentinel.
+
2015-07-23 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/52987
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 95ec376..5004883 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14917,6 +14917,7 @@ tsubst_copy_and_build (tree t,
{
warning_sentinel s1(warn_type_limits);
warning_sentinel s2(warn_div_by_zero);
+ warning_sentinel s3(warn_logical_op);
tree op0 = RECUR (TREE_OPERAND (t, 0));
tree op1 = RECUR (TREE_OPERAND (t, 1));
tree r = build_x_binary_op
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8c6d7e1..6bbc2e6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-23 Marek Polacek <polacek@redhat.com>
+
+ PR c++/66572
+ * g++.dg/warn/Wlogical-op-2.C: New test.
+
2015-07-23 Alexandre Oliva <aoliva@redhat.com>
PR rtl-optimization/64164
diff --git a/gcc/testsuite/g++.dg/warn/Wlogical-op-2.C b/gcc/testsuite/g++.dg/warn/Wlogical-op-2.C
new file mode 100644
index 0000000..755db08
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wlogical-op-2.C
@@ -0,0 +1,30 @@
+// PR c++/66572
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wlogical-op" }
+
+struct false_type
+{
+ static constexpr bool value = false;
+};
+
+struct true_type
+{
+ static constexpr bool value = true;
+};
+
+template<typename T>
+struct is_unsigned : false_type {};
+
+template<>
+struct is_unsigned<unsigned> : true_type {};
+
+template<typename T1, typename T2>
+bool foo()
+{
+ return is_unsigned<T1>::value && is_unsigned<T2>::value;
+}
+
+int main()
+{
+ foo<unsigned, unsigned>();
+}