From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id CE03D3857806; Tue, 12 Apr 2022 20:14:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CE03D3857806 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-9829] c++: -Wshadow=compatible-local type vs var [PR100608] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 556d061e62ea863c7f99129219ca69bf0792c7f1 X-Git-Newrev: c52cd0b35d356565f67f7956f4defc022dfa2172 Message-Id: <20220412201449.CE03D3857806@sourceware.org> Date: Tue, 12 Apr 2022 20:14:49 +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, 12 Apr 2022 20:14:49 -0000 https://gcc.gnu.org/g:c52cd0b35d356565f67f7956f4defc022dfa2172 commit r11-9829-gc52cd0b35d356565f67f7956f4defc022dfa2172 Author: Jason Merrill Date: Tue Apr 5 16:02:04 2022 -0400 c++: -Wshadow=compatible-local type vs var [PR100608] The patch for PR92024 changed -Wshadow=compatible-local to warn if either new or old decl was a type, but the rationale only talked about the case where both are types. If only one is, they aren't compatible. PR c++/100608 gcc/cp/ChangeLog: * name-lookup.c (check_local_shadow): Use -Wshadow=local if exactly one of 'old' and 'decl' is a type. gcc/testsuite/ChangeLog: * g++.dg/warn/Wshadow-compatible-local-3.C: New test. Diff: --- gcc/cp/name-lookup.c | 4 ++++ gcc/testsuite/g++.dg/warn/Wshadow-compatible-local-3.C | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index e9af670c28f..2901e048b8d 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -3259,6 +3259,10 @@ check_local_shadow (tree decl) enum opt_code warning_code; if (warn_shadow) warning_code = OPT_Wshadow; + else if ((TREE_CODE (decl) == TYPE_DECL) + ^ (TREE_CODE (old) == TYPE_DECL)) + /* If exactly one is a type, they aren't compatible. */ + warning_code = OPT_Wshadow_local; else if ((TREE_TYPE (old) && TREE_TYPE (decl) && same_type_p (TREE_TYPE (old), TREE_TYPE (decl))) diff --git a/gcc/testsuite/g++.dg/warn/Wshadow-compatible-local-3.C b/gcc/testsuite/g++.dg/warn/Wshadow-compatible-local-3.C new file mode 100644 index 00000000000..0e5ece74b37 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wshadow-compatible-local-3.C @@ -0,0 +1,10 @@ +// PR c++/100608 +// { dg-do compile { target c++11 } } +// { dg-additional-options "-Wshadow=compatible-local" } + +template class X {}; + +void foo() +{ + auto a = X{}; // no warning, not compatible +}