diff options
| author | Alexandre Oliva <oliva@adacore.com> | 2023-03-03 01:46:56 -0300 |
|---|---|---|
| committer | Alexandre Oliva <oliva@gnu.org> | 2023-03-03 01:46:56 -0300 |
| commit | 2e8686cb51896e0f89b353ae599c2c1ac5b960d6 (patch) | |
| tree | e9975d689b75ff71cea184e17cfc6b3e0eac64a7 | |
| parent | dc1be3eb33c7f37ac45ad0ccf5be063134a513be (diff) | |
| download | gcc-2e8686cb51896e0f89b353ae599c2c1ac5b960d6.zip gcc-2e8686cb51896e0f89b353ae599c2c1ac5b960d6.tar.gz gcc-2e8686cb51896e0f89b353ae599c2c1ac5b960d6.tar.bz2 | |
[c++] suppress redundant null-addr warn in pfn from pmfn
When TARGET_PTRMEMFUNC_VBIT_LOCATION == ptrmemfunc_vbit_in_delta, when
we warn about comparing a pointer-to-member-function with NULL, we
also warn about comparing the pointer-to-function extracted from it
with NULL, which is redundant. Suppress the redundant warning.
for gcc/cp/ChangeLog
* typeck.cc (cp_build_binary_op): Suppress redundant warning
for pfn null test in pmfn test with vbit-in-delta.
| -rw-r--r-- | gcc/cp/typeck.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc index 4afb5e4..d5a3e50 100644 --- a/gcc/cp/typeck.cc +++ b/gcc/cp/typeck.cc @@ -5780,11 +5780,18 @@ cp_build_binary_op (const op_location_t &location, pfn0 = pfn_from_ptrmemfunc (op0); delta0 = delta_from_ptrmemfunc (op0); - e1 = cp_build_binary_op (location, - EQ_EXPR, - pfn0, - build_zero_cst (TREE_TYPE (pfn0)), - complain); + { + /* If we will warn below about a null-address compare + involving the orig_op0 ptrmemfunc, we'd likely also + warn about the pfn0's null-address compare, and + that would be redundant, so suppress it. */ + warning_sentinel ws (warn_address); + e1 = cp_build_binary_op (location, + EQ_EXPR, + pfn0, + build_zero_cst (TREE_TYPE (pfn0)), + complain); + } e2 = cp_build_binary_op (location, BIT_AND_EXPR, delta0, |