diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-02-19 20:16:31 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-02-19 20:16:31 +0100 |
| commit | 7a965d512188e997ab9f0f35e9d4b287ca46919c (patch) | |
| tree | 2f2ea14aaad172874557dbe5f5b41eda91d83519 | |
| parent | c464c0db19b07ffa32e1a7fa574335b625ac765f (diff) | |
| download | gcc-7a965d512188e997ab9f0f35e9d4b287ca46919c.zip gcc-7a965d512188e997ab9f0f35e9d4b287ca46919c.tar.gz gcc-7a965d512188e997ab9f0f35e9d4b287ca46919c.tar.bz2 | |
re PR c++/69850 (unnecessary -Wnonnull-compare warning)
PR c++/69850
* rtti.c (ifnonnull): Set TREE_NO_WARNING on the condition, use
NE_EXPR instead of EQ_EXPR and swap last two arguments on COND_EXPR.
* g++.dg/warn/Wnonnull-compare-4.C: New test.
From-SVN: r233568
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/rtti.c | 13 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/Wnonnull-compare-4.C | 14 |
4 files changed, 30 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8f9b0be1..a80abb5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-02-19 Jakub Jelinek <jakub@redhat.com> + + PR c++/69850 + * rtti.c (ifnonnull): Set TREE_NO_WARNING on the condition, use + NE_EXPR instead of EQ_EXPR and swap last two arguments on COND_EXPR. + 2016-02-19 Patrick Palka <ppalka@gcc.gnu.org> PR c++/68948 diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 69c3905..244c34d 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -507,12 +507,13 @@ get_typeid (tree type, tsubst_flags_t complain) static tree ifnonnull (tree test, tree result, tsubst_flags_t complain) { - return build3 (COND_EXPR, TREE_TYPE (result), - build2 (EQ_EXPR, boolean_type_node, test, - cp_convert (TREE_TYPE (test), nullptr_node, - complain)), - cp_convert (TREE_TYPE (result), nullptr_node, complain), - result); + tree cond = build2 (NE_EXPR, boolean_type_node, test, + cp_convert (TREE_TYPE (test), nullptr_node, complain)); + /* This is a compiler generated comparison, don't emit + e.g. -Wnonnull-compare warning for it. */ + TREE_NO_WARNING (cond) = 1; + return build3 (COND_EXPR, TREE_TYPE (result), cond, result, + cp_convert (TREE_TYPE (result), nullptr_node, complain)); } /* Execute a dynamic cast, as described in section 5.2.6 of the 9/93 working diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f753e7b..74fd5c3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2016-02-19 Jakub Jelinek <jakub@redhat.com> + PR c++/69850 + * g++.dg/warn/Wnonnull-compare-4.C: New test. + PR c++/69851 * g++.dg/torture/pr69851.C: New test. diff --git a/gcc/testsuite/g++.dg/warn/Wnonnull-compare-4.C b/gcc/testsuite/g++.dg/warn/Wnonnull-compare-4.C new file mode 100644 index 0000000..851ed72 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wnonnull-compare-4.C @@ -0,0 +1,14 @@ +// PR c++/69850 +// { dg-do compile } +// { dg-options "-Wnonnull-compare" } + +struct A { virtual ~A (); int foo (); }; +struct B { virtual ~B () { } }; +struct C : B, A { }; + +int +A::foo () +{ + C *c = dynamic_cast<C *> (this); // { dg-bogus "nonnull argument" } + return !c; +} |