From patchwork Wed Mar 1 20:33:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 63085 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3854396wrd; Wed, 1 Mar 2023 12:34:07 -0800 (PST) X-Google-Smtp-Source: AK7set+2sjfGUtUhKpQKmc13cXSyoRLzVYBM0Pq5/w6pZ0hu+q/UjsiGJ4NYSAlBdgQgHYf9WdoU X-Received: by 2002:a17:907:2cc4:b0:8a9:e031:c4b7 with SMTP id hg4-20020a1709072cc400b008a9e031c4b7mr9647891ejc.4.1677702846942; Wed, 01 Mar 2023 12:34:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677702846; cv=none; d=google.com; s=arc-20160816; b=Rxdl5rG4X75U3wtKVOPJ1b1LeZ0MiCPy+R4CpMFghS9pVBWVXqXhFSuPcRPasPo2VK nOZ2hZ4+xO1H9cpI8OcRQsE8Fqo2tCQP/IaMORlKx5QBcZHW4H4rHmQyW9MFT/IxfzWp tNaXnDJTMKe5vskyBy1Qtvz2iLyswH6yP/G/ZBiPBwu+YS6Je8BXkZk7Em/YNlMShTQU +CmdlwXb2esHgt5ibiCbimxB6BO9BFd0vovbuQRvLEyhoLHMJ5zTBr73B7rRfs3Lm7lx Qc8LLrbPmXGdY2/XcSjBhIniJELAoCUdGuDIPeZLnL9Jc9Ym2zH48CkobDRdl/I1GeFC 8jRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=HVlvayVoAuEtbqczfCNYkOHXY4EwpBmvdYmqCmaNfqU=; b=oMdwtiaqdZ9T0gF081IBgpltR8Gu5s+Mr0pel/N53rdAnxGzBsW9qSksgVSw+qDdRZ AUqct2gJB3qMWqWRauGf3Qj0rX0bcbOX7hBTY3SLRwXpIpGZJ35cZekXSZQyegq2H28u 993O7bTTT/CU9I9exR3KjB4LdWW+hEgJU2d2GDqeC8NjkPbsNVtgY7ZM8zUPF7krcCH9 9TV6m1lbAZj8XsO6xCngzhsIK9xU4iDTKORJrhLp/kOo58eQP3yLnbk0pcPDfD406tYr +80npD0g2NMyu94Un0NCOw1ccDtRAtwe8g155w1cwVqYaYbUkQXcwp2h7Wy6cufER772 80ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=cOtoQARn; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id sh39-20020a1709076ea700b008d356e98512si4617995ejc.95.2023.03.01.12.34.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 12:34:06 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=cOtoQARn; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A4AF23858C5E for ; Wed, 1 Mar 2023 20:34:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A4AF23858C5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677702845; bh=HVlvayVoAuEtbqczfCNYkOHXY4EwpBmvdYmqCmaNfqU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=cOtoQARn3gWFCB9p3vEfkZv2yJIP+GZ9IuYT0U1eFXhCt9qKd32WajnDpkpY2/0Kr ckUuuWdW15mRt7R1LpNhHgWZeOMpuXMrCPklkB6RC9DczHrQbs9NcacmukPasRl0w/ GaDbR3uH/Hx1de85a0873GMVQGefHh5neINFXMXE= 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 D53C43858D33 for ; Wed, 1 Mar 2023 20:33:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D53C43858D33 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-284-p2wDYc0IPdGuMF7JgcWV8A-1; Wed, 01 Mar 2023 15:33:13 -0500 X-MC-Unique: p2wDYc0IPdGuMF7JgcWV8A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 98A7685CCE3 for ; Wed, 1 Mar 2023 20:33:12 +0000 (UTC) Received: from pdp-11.lan (unknown [10.22.17.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BAF3140EBF4; Wed, 1 Mar 2023 20:33:12 +0000 (UTC) To: Jason Merrill , GCC Patches Subject: [PATCH] c++: ICE with -Wmismatched-tags and member template [PR106259] Date: Wed, 1 Mar 2023 15:33:08 -0500 Message-Id: <20230301203308.405645-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.9 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_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Marek Polacek via Gcc-patches From: Marek Polacek Reply-To: Marek Polacek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759198940180742411?= X-GMAIL-MSGID: =?utf-8?q?1759198940180742411?= -Wmismatched-tags warns about the (harmless) struct/class mismatch. For, e.g., template struct A { }; class A a; it works by adding A to the class2loc hash table while parsing the class-head and then, while parsing the elaborate type-specifier, we add A. At the end of c_parse_file we go through the table and warn about the class-key mismatches. In this PR we crash though; we have template struct A { template struct W { }; }; struct A::W w; // #1 where while parsing A and #1 we've stashed A A::W A::W into class2loc. Then in class_decl_loc_t::diag_mismatched_tags TYPE is A::W, and specialization_of gets us A::W, which is not in class2loc, so we crash on gcc_assert (cdlguide). But it's OK not to have found A::W, we should just look one "level" up, that is, A::W. It's important to handle class specializations, so e.g. template<> struct A { template class W { }; }; where W's class-key is different than in the primary template above, so we should warn depending on whether we're looking into A or into a different instantiation. Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? PR c++/106259 gcc/cp/ChangeLog: * parser.cc (class_decl_loc_t::diag_mismatched_tags): If the first lookup of SPEC didn't find anything, try to look for most_general_template. gcc/testsuite/ChangeLog: * g++.dg/warn/Wmismatched-tags-11.C: New test. --- gcc/cp/parser.cc | 30 +++++++++++++++---- .../g++.dg/warn/Wmismatched-tags-11.C | 23 ++++++++++++++ 2 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/Wmismatched-tags-11.C base-commit: 096f034a8f5df41f610e62c1592fb90a3f551cd5 diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 1a124f5395e..b528ee7b1d9 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -34473,14 +34473,32 @@ class_decl_loc_t::diag_mismatched_tags (tree type_decl) be (and inevitably is) at index zero. */ tree spec = specialization_of (type); cdlguide = class2loc.get (spec); + /* It's possible that we didn't find SPEC. Consider: + + template struct A { + template struct W { }; + }; + struct A::W w; // #1 + + where while parsing A and #1 we've stashed + A + A::W + A::W + into CLASS2LOC. If TYPE is A::W, specialization_of + will yield A::W which may be in CLASS2LOC if we had + an A class specialization, but otherwise won't be in it. + So try to look up A::W. */ + if (!cdlguide) + { + spec = DECL_TEMPLATE_RESULT (most_general_template (spec)); + cdlguide = class2loc.get (spec); + } + /* Now we really should have found something. */ gcc_assert (cdlguide != NULL); } - else - { - /* Skip declarations that consistently use the same class-key. */ - if (def_class_key != none_type) - return; - } + /* Skip declarations that consistently use the same class-key. */ + else if (def_class_key != none_type) + return; /* Set if a definition for the class has been seen. */ const bool def_p = cdlguide->def_p (); diff --git a/gcc/testsuite/g++.dg/warn/Wmismatched-tags-11.C b/gcc/testsuite/g++.dg/warn/Wmismatched-tags-11.C new file mode 100644 index 00000000000..6c4e571726a --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wmismatched-tags-11.C @@ -0,0 +1,23 @@ +// PR c++/106259 +// { dg-do compile } +// { dg-options "-Wmismatched-tags" } + +template struct A { + template + struct W { }; +}; + +template<> +struct A { + template + class W { }; +}; + +void +g () +{ + struct A::W w1; // { dg-warning "mismatched" } + struct A::W w2; + class A::W w3; + class A::W w4; // { dg-warning "mismatched" } +}