From: Mikhail Maltsev <maltsevm@gmail.com>
To: Jason Merrill <jason@redhat.com>,
gcc-patches <gcc-patches@gnu.org>,
Marek Polacek <polacek@redhat.com>
Subject: Re: [Patch, C++, PR65882] Check tf_warning flag in build_new_op_1
Date: Sat, 20 Jun 2015 00:36:00 -0000 [thread overview]
Message-ID: <5584B276.1090901@gmail.com> (raw)
In-Reply-To: <558444DE.3070204@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
On 19.06.2015 19:35, Jason Merrill wrote:
> OK, thanks.
>
> Sorry this took so long to review; please feel free to ping me every week.
>
> Jason
I added the testcase from PR66467, bootstrapped and regtested on
x86_64-linux. The final variant is attached. I applied it to trunk.
I see that version 5.2 is set as target milestone for this bug. Should I
backport the patch?
--
Regards,
Mikhail Maltsev
[-- Attachment #2: pr65882-final.patch --]
[-- Type: text/plain, Size: 3433 bytes --]
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index eb5e4c5..6656441 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-20 Mikhail Maltsev <maltsevm@gmail.com>
+
+ PR c++/65882
+ * call.c (build_new_op_1): Check tf_warning flag in all cases.
+
2015-06-19 Jason Merrill <jason@redhat.com>
PR c++/66585
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 5d1891d..ba5da4c 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5640,8 +5640,9 @@ build_new_op_1 (location_t loc, enum tree_code code, int flags, tree arg1,
case TRUTH_ORIF_EXPR:
case TRUTH_AND_EXPR:
case TRUTH_OR_EXPR:
- warn_logical_operator (loc, code, boolean_type_node,
- code_orig_arg1, arg1, code_orig_arg2, arg2);
+ if (complain & tf_warning)
+ warn_logical_operator (loc, code, boolean_type_node,
+ code_orig_arg1, arg1, code_orig_arg2, arg2);
/* Fall through. */
case GT_EXPR:
case LT_EXPR:
@@ -5649,8 +5650,9 @@ build_new_op_1 (location_t loc, enum tree_code code, int flags, tree arg1,
case LE_EXPR:
case EQ_EXPR:
case NE_EXPR:
- if ((code_orig_arg1 == BOOLEAN_TYPE)
- ^ (code_orig_arg2 == BOOLEAN_TYPE))
+ if ((complain & tf_warning)
+ && ((code_orig_arg1 == BOOLEAN_TYPE)
+ ^ (code_orig_arg2 == BOOLEAN_TYPE)))
maybe_warn_bool_compare (loc, code, arg1, arg2);
/* Fall through. */
case PLUS_EXPR:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 42a0ee9d..89b859f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-20 Mikhail Maltsev <maltsevm@gmail.com>
+
+ PR c++/65882
+ * g++.dg/diagnostic/inhibit-warn-1.C: New test.
+ * g++.dg/diagnostic/inhibit-warn-2.C: New test.
+
2015-06-19 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/specs/debug1.ads: Adjust.
diff --git a/gcc/testsuite/g++.dg/diagnostic/inhibit-warn-1.C b/gcc/testsuite/g++.dg/diagnostic/inhibit-warn-1.C
new file mode 100644
index 0000000..5655eb4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/inhibit-warn-1.C
@@ -0,0 +1,32 @@
+// PR c++/65882
+// { dg-do compile { target c++11 } }
+// { dg-options "-Wbool-compare" }
+
+// Check that we don't ICE because of reentering error reporting routines while
+// evaluating template parameters
+
+template<typename>
+struct type_function {
+ static constexpr bool value = false;
+};
+
+template<bool>
+struct dependent_type {
+ typedef int type;
+};
+
+template<typename T>
+typename dependent_type<(5 > type_function<T>::value)>::type
+bar();
+
+template<typename T>
+typename dependent_type<(5 > type_function<T>::value)>::type
+foo()
+{
+ return bar<int>();
+}
+
+int main()
+{
+ foo<int>();
+}
diff --git a/gcc/testsuite/g++.dg/diagnostic/inhibit-warn-2.C b/gcc/testsuite/g++.dg/diagnostic/inhibit-warn-2.C
new file mode 100644
index 0000000..cb16b4c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/inhibit-warn-2.C
@@ -0,0 +1,36 @@
+// PR c++/65882
+// PR c++/66467
+// { dg-do compile }
+
+template <bool>
+struct A
+{
+ typedef int type;
+};
+
+struct B
+{
+ static const int value = 0;
+};
+
+template <class>
+struct C
+{
+ typedef int type;
+};
+
+template <class>
+struct F : B {};
+
+class D
+{
+ template <class Expr>
+ typename A<F<typename C<Expr>::type>::value || B::value>::type
+ operator=(Expr); // { dg-message "declared" }
+};
+
+void fn1()
+{
+ D opt;
+ opt = 0; // { dg-error "private" }
+}
next prev parent reply other threads:[~2015-06-20 0:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-26 11:11 Mikhail Maltsev
2015-06-09 7:53 ` Marek Polacek
2015-06-19 16:43 ` Jason Merrill
2015-06-20 0:36 ` Mikhail Maltsev [this message]
2015-06-22 17:00 ` Jason Merrill
2015-06-24 16:05 ` Christophe Lyon
2015-06-24 20:39 ` Mikhail Maltsev
2015-06-26 10:02 ` James Greenhalgh
2015-06-26 21:59 ` Jason Merrill
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5584B276.1090901@gmail.com \
--to=maltsevm@gmail.com \
--cc=gcc-patches@gnu.org \
--cc=jason@redhat.com \
--cc=polacek@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).