From 315aa691f486bfe71bae0a5fc8828db26daebb56 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 23 Jul 2018 09:48:56 +0200 Subject: [PATCH] re PR c++/86569 (-Wnonnull-compare affects code generation since r233684) PR c++/86569 * cp-gimplify.c (cp_fold): Don't fold comparisons into other kind of expressions other than INTEGER_CST regardless of TREE_NO_WARNING or warn_nonnull_compare. * g++.dg/warn/Wnonnull-compare-9.C: New test. From-SVN: r262928 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/cp-gimplify.c | 15 ++++++++++----- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/warn/Wnonnull-compare-9.C | 11 +++++++++++ 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/Wnonnull-compare-9.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 125f169..f1185c4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2018-07-23 Jakub Jelinek + + PR c++/86569 + * cp-gimplify.c (cp_fold): Don't fold comparisons into other kind + of expressions other than INTEGER_CST regardless of TREE_NO_WARNING + or warn_nonnull_compare. + 2018-07-19 Paolo Carlini Revert fix for c++/59480 (and testsuite followup) diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index 356b188..28802b5 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -2381,21 +2381,26 @@ cp_fold (tree x) else x = fold (x); - if (TREE_NO_WARNING (org_x) - && warn_nonnull_compare - && COMPARISON_CLASS_P (org_x)) + /* This is only needed for -Wnonnull-compare and only if + TREE_NO_WARNING (org_x), but to avoid that option affecting code + generation, we do it always. */ + if (COMPARISON_CLASS_P (org_x)) { if (x == error_mark_node || TREE_CODE (x) == INTEGER_CST) ; else if (COMPARISON_CLASS_P (x)) - TREE_NO_WARNING (x) = 1; + { + if (TREE_NO_WARNING (org_x) && warn_nonnull_compare) + TREE_NO_WARNING (x) = 1; + } /* Otherwise give up on optimizing these, let GIMPLE folders optimize those later on. */ else if (op0 != TREE_OPERAND (org_x, 0) || op1 != TREE_OPERAND (org_x, 1)) { x = build2_loc (loc, code, TREE_TYPE (org_x), op0, op1); - TREE_NO_WARNING (x) = 1; + if (TREE_NO_WARNING (org_x) && warn_nonnull_compare) + TREE_NO_WARNING (x) = 1; } else x = org_x; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ecf7b05..b5e2a54 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-07-23 Jakub Jelinek + + PR c++/86569 + * g++.dg/warn/Wnonnull-compare-9.C: New test. + 2018-07-20 Martin Sebor PR middle-end/82063 diff --git a/gcc/testsuite/g++.dg/warn/Wnonnull-compare-9.C b/gcc/testsuite/g++.dg/warn/Wnonnull-compare-9.C new file mode 100644 index 0000000..f8fa3c0 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wnonnull-compare-9.C @@ -0,0 +1,11 @@ +// PR c++/86569 +// { dg-do compile } +// { dg-options "-fcompare-debug=-Wnonnull-compare" } + +bool b; + +int +main () +{ + return ((!b) != 0); +} -- 2.7.4