From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1930) id 3118E3857439; Tue, 23 Nov 2021 22:37:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3118E3857439 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Sebor To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5484] Issue -Waddress also for reference members [PR96507]. X-Act-Checkin: gcc X-Git-Author: Martin Sebor X-Git-Refname: refs/heads/master X-Git-Oldrev: 30ba058f77eedfaf7a0582f5d42aff949710bce4 X-Git-Newrev: 2dd56aed3e4e1938a9020ab2fe6a410e1a1c2eb3 Message-Id: <20211123223718.3118E3857439@sourceware.org> Date: Tue, 23 Nov 2021 22:37:18 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Nov 2021 22:37:18 -0000 https://gcc.gnu.org/g:2dd56aed3e4e1938a9020ab2fe6a410e1a1c2eb3 commit r12-5484-g2dd56aed3e4e1938a9020ab2fe6a410e1a1c2eb3 Author: Martin Sebor Date: Tue Nov 23 15:35:31 2021 -0700 Issue -Waddress also for reference members [PR96507]. Resolves: PR c++/96507 - missing -Waddress for member references gcc/cp/ChangeLog: PR c++/96507 * typeck.c (warn_for_null_address): Handle reference members. gcc/testsuite/ChangeLog: PR c++/96507 * g++.dg/warn/Waddress-8.C: New test. Diff: --- gcc/cp/typeck.c | 5 +- gcc/testsuite/g++.dg/warn/Waddress-8.C | 85 ++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 84dcb6f014f..872e944dc2e 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4677,10 +4677,13 @@ warn_for_null_address (location_t location, tree op, tsubst_flags_t complain) return; } else if (CONVERT_EXPR_P (op) - && TYPE_REF_P (TREE_TYPE (TREE_OPERAND (op, 0)))) + && TYPE_REF_P (TREE_TYPE (TREE_OPERAND (op, 0)))) { STRIP_NOPS (op); + if (TREE_CODE (op) == COMPONENT_REF) + op = TREE_OPERAND (op, 1); + if (DECL_P (op)) warned = warning_at (location, OPT_Waddress, "the compiler can assume that the address of " diff --git a/gcc/testsuite/g++.dg/warn/Waddress-8.C b/gcc/testsuite/g++.dg/warn/Waddress-8.C new file mode 100644 index 00000000000..797102d6be4 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Waddress-8.C @@ -0,0 +1,85 @@ +/* PR c++/96507 - missing -Waddress for member references + { dg-do compile } + { dg-options "-Wall" } */ + +typedef void F (); + +extern F 𝔢 +extern int &eir; + +bool warn_ext_rfun () +{ + return &efr != 0; // { dg-warning "-Waddress" } +} + +bool warn_ext_rvar () +{ + return &eir != 0; // { dg-warning "-Waddress" } +} + + +bool warn_parm_rfun (F &rf) +{ + return &rf != 0; // { dg-warning "-Waddress" } +} + +bool warn_parm_rvar (int &ir) +{ + return &ir != 0; // { dg-warning "-Waddress" } +} + +// Comparing the address of a reference argument to null also triggers +// a -Wnonnull-compare (that seems like a bug, hence PR 103363). +// { dg-prune-output "-Wnonnull-compare" } + + +struct S +{ + F &fr; + int &ir; +}; + +extern S es, esa[]; + +bool warn_ext_mem_rfun () +{ + return &es.fr != 0; // { dg-warning "-Waddress" } +} + +bool warn_ext_mem_rvar () +{ + return &es.ir != 0; // { dg-warning "-Waddress" } +} + + +bool warn_ext_arr_mem_rfun (int i) +{ + return &esa[i].fr != 0; // { dg-warning "-Waddress" } +} + +bool warn_ext_arr_mem_rvar (int i) +{ + return &esa[i].ir != 0; // { dg-warning "-Waddress" } +} + + +bool warn_parm_mem_rfun (S &s) +{ + return &s.fr != 0; // { dg-warning "-Waddress" } +} + +bool warn_parm_mem_rvar (S &s) +{ + return &s.ir != 0; // { dg-warning "-Waddress" } +} + + +bool warn_parm_arr_mem_rfun (S sa[], int i) +{ + return &sa[i].fr != 0; // { dg-warning "-Waddress" } +} + +bool warn_parm_arr_mem_rvar (S sa[], int i) +{ + return &sa[i].ir != 0; // { dg-warning "-Waddress" } +}