From patchwork Wed Apr 6 14:30:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1613982 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=lQBsEEv2; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KYRlX1JD6z9sFq for ; Thu, 7 Apr 2022 00:31:18 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1EEF13853804 for ; Wed, 6 Apr 2022 14:31:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1EEF13853804 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1649255476; bh=xGI3/W1ZNQBiPAWrCeMQk2YzETKhdN7xyItSOZ7+noo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=lQBsEEv2NF1vUiut+f2XFQazU8/5tBdg8sh7olIcFeJvpUCXw/cIgtNMCGzkgaAy3 ctI880RyWko7BZZKH9DQiGBEeesfEENIG83N3ldvoXO+X2vnSEzTQKn80ucxLnF6yK 0BvYYQqEo/QKuZSO01v0N2i3KSBOLboJZSCdcdE8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 36F68385840C for ; Wed, 6 Apr 2022 14:30:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 36F68385840C Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-638-Zauk_OSYPPiQdD4yqaAcAA-1; Wed, 06 Apr 2022 10:30:54 -0400 X-MC-Unique: Zauk_OSYPPiQdD4yqaAcAA-1 Received: by mail-qv1-f71.google.com with SMTP id kc2-20020a056214410200b00443e6240ba1so3708527qvb.6 for ; Wed, 06 Apr 2022 07:30:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xGI3/W1ZNQBiPAWrCeMQk2YzETKhdN7xyItSOZ7+noo=; b=Tz49Xcc3jzp1ogo4lmKFImUyOkVp5kwbzyRubau/r90I+A6xf3rSbnVEoWl+K1QPg4 QfWbIWQt/FZS5LFKpjTdjBGsPCZiet9+6srXXWLK57N4xCyEkH7GKKEIuY7VgDyvyN9T bbDynptBPxAWFcGfI0yxvKYHrLD/+5KMW2FFX/pnGBV/Q7+PWuWChe3z/EXQLoQUXw1I 6BGdzMHLgXEI0t+Q6+r5tg5WAFYD91w8JRn9848Su4kbZWH0Zm1yoxVFb0wWJAluFIBJ Qig5cB1RmCXnFNKyi7o4X/uqaB0lkkA12705uYNpTiF76/GESoPKF8b65BGIA7Mp6x+q i/yQ== X-Gm-Message-State: AOAM533ftV+nm62IyGPTMcCFMK1PTsYTqpMRiD0ndOdqdw2crV3IVTGv 3QR0IthxLiF5TlZ1hm2vcgncJnluIfbsRhmBbcHWv/jjWDPdT5sB9dibrKBldRPf4iHeRSm5TF5 wRvf54vir7qJIk8/GtDHDxv0rscN2GwEMVz2kCzazuwuGQYC6X79u0MjLynXbKVkUIw== X-Received: by 2002:a0c:cd05:0:b0:443:cd52:7829 with SMTP id b5-20020a0ccd05000000b00443cd527829mr7637895qvm.98.1649255453953; Wed, 06 Apr 2022 07:30:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcamhF2FbT39AUreryU8VdPd6CuGQPRPQvruQu5HhIIroeBEIONanGxupU5QRmxJQfT1Qjjw== X-Received: by 2002:a0c:cd05:0:b0:443:cd52:7829 with SMTP id b5-20020a0ccd05000000b00443cd527829mr7637850qvm.98.1649255453445; Wed, 06 Apr 2022 07:30:53 -0700 (PDT) Received: from barrymore.redhat.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id j188-20020a3755c5000000b0067d1c76a09fsm10025577qkb.74.2022.04.06.07.30.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 07:30:52 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: -Wshadow=compatible-local type vs var [PR100608] Date: Wed, 6 Apr 2022 10:30:49 -0400 Message-Id: <20220406143049.2258802-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/100608 gcc/cp/ChangeLog: * name-lookup.cc (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. --- gcc/cp/name-lookup.cc | 4 ++++ gcc/testsuite/g++.dg/warn/Wshadow-compatible-local-3.C | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 gcc/testsuite/g++.dg/warn/Wshadow-compatible-local-3.C base-commit: e1a5e7562d53a8d2256f754714b06595bea72196 diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc index c833b84ca8a..d16c577c029 100644 --- a/gcc/cp/name-lookup.cc +++ b/gcc/cp/name-lookup.cc @@ -3249,6 +3249,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 +}