From 7a965d512188e997ab9f0f35e9d4b287ca46919c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 19 Feb 2016 20:16:31 +0100 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/rtti.c | 13 +++++++------ gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/warn/Wnonnull-compare-4.C | 14 ++++++++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/Wnonnull-compare-4.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8f9b0be1327c..a80abb57b26b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2016-02-19 Jakub Jelinek + + 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 PR c++/68948 diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 69c39055d8b6..244c34d0580b 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 f753e7bdec82..74fd5c3fd1f0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2016-02-19 Jakub Jelinek + 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 000000000000..851ed72654e4 --- /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 (this); // { dg-bogus "nonnull argument" } + return !c; +} -- 2.47.2