diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2018-07-23 09:48:56 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2018-07-23 09:48:56 +0200 |
| commit | 315aa691f486bfe71bae0a5fc8828db26daebb56 (patch) | |
| tree | 6c1df506f9a1846bd981daed7c17c39dec0df523 /gcc/cp/cp-gimplify.c | |
| parent | d9690d237cf5d195322e2ebbd29f13b1273ecc68 (diff) | |
| download | gcc-315aa691f486bfe71bae0a5fc8828db26daebb56.zip gcc-315aa691f486bfe71bae0a5fc8828db26daebb56.tar.gz gcc-315aa691f486bfe71bae0a5fc8828db26daebb56.tar.bz2 | |
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
Diffstat (limited to 'gcc/cp/cp-gimplify.c')
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 15 |
1 files changed, 10 insertions, 5 deletions
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; |