From patchwork Thu Mar 23 03:23:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1760122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.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=aXF6Jx4q; dkim-atps=neutral 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PhrL51ySYz1yXv for ; Thu, 23 Mar 2023 14:24:28 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 610243850873 for ; Thu, 23 Mar 2023 03:24:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 610243850873 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679541862; bh=4LIfPHCobHfZMnZneVI8BNrTRr5U3HmHmQ+APewsJfg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=aXF6Jx4qVdbnTHy67GhZjalBya+yMzU+T8JwdXkli5f2+iHcM1j3PV+3A6Nty6qzw /ATERON60P07UkP7Hmx4DQPlWExRhoZnTSbCMSLVnjZ6MXSe5fPsUHnnRT7UP7SHa3 53Ng0zG4vEtHefLERM6HR+lNN63j/x9Y+sPk5kKw= 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 642493854811 for ; Thu, 23 Mar 2023 03:24:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 642493854811 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-380-K57y3I2qNA6BBLnQ6Ex9fg-1; Wed, 22 Mar 2023 23:24:00 -0400 X-MC-Unique: K57y3I2qNA6BBLnQ6Ex9fg-1 Received: by mail-qv1-f71.google.com with SMTP id px9-20020a056214050900b005d510cdfc41so3048843qvb.7 for ; Wed, 22 Mar 2023 20:24:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679541839; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4LIfPHCobHfZMnZneVI8BNrTRr5U3HmHmQ+APewsJfg=; b=5/0rKbFRmjhsfiY4G9weieXYdWkReuyvMeC8Qz5rgcuV/bu5oCKDSP85fLqaDySPi3 qdLLMo4P7CJtRMCGE1WOaldtzvbXe8za+E/lmY/LwR0cF9BvW3H3Vg8+gRhxwh6i6u5m O4FYBAaQsONr50t+Jr4sdnQauyfVGBKRrep7PCxkTcRYcQpp4jtRneQIc68YjJoFqqw+ juB9Okh9iTY4DsX6Bsf3dkVy9ewaJ8exaGycSrlaxQOZuA3bxi2tFaKU45YRJuoFlLdY 3GB71EWxwL2F8qvFCMBzqsbz4M/4eTj6hJtb0jUEtOKXMgbG67CiJ5XfAvytxG2PWQkW 3nIA== X-Gm-Message-State: AO0yUKXc7htc5LX7FlXoJfOSF2DGTTQMayB8onGYW4p7uvsCSpagG8AY VlVw4Fy117yRcST/lSpst5pLlkphsYk/FyqEzkHiRHEERE0e6T0Imc9ZU8wQz617UXkuvINo/nb 9U0Q8BO4iYK/6dJkuTx8+b4ShFMRmB3Vg25N+VtzTRwuKhwTKi1DtFRAS567tWmRIxSX3CocSYA == X-Received: by 2002:a05:622a:3cb:b0:3e3:9036:8d98 with SMTP id k11-20020a05622a03cb00b003e390368d98mr3909165qtx.33.1679541839587; Wed, 22 Mar 2023 20:23:59 -0700 (PDT) X-Google-Smtp-Source: AK7set/LZ8gaHE/UCHOJZbZknFzxfOmpXmvonRQsZDIh8nRTJTOyszLropvPy68RamHuTUKZ5Vyn6g== X-Received: by 2002:a05:622a:3cb:b0:3e3:9036:8d98 with SMTP id k11-20020a05622a03cb00b003e390368d98mr3909152qtx.33.1679541839186; Wed, 22 Mar 2023 20:23:59 -0700 (PDT) Received: from jason.cygnus.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 d71-20020ae9ef4a000000b007469dfd4dd5sm4329651qkg.106.2023.03.22.20.23.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 20:23:58 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: local class in nested generic lambda [PR109241] Date: Wed, 22 Mar 2023 23:23:55 -0400 Message-Id: <20230323032355.2678239-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 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: 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" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- In this testcase, the tree walk to look for bare parameter packs was confused by finding a type with no TREE_BINFO. But it should be fine that it's unset; we already checked for unexpanded packs at parse time. I also tried doing the partial instantiation of the local class, which is probably the long-term direction we want to go, but for stage 4 let's go with this safer change. PR c++/109241 gcc/cp/ChangeLog: * pt.cc (find_parameter_packs_r): Handle null TREE_BINFO. gcc/testsuite/ChangeLog: * g++.dg/cpp1y/lambda-generic-local-class2.C: New test. --- gcc/cp/pt.cc | 12 ++++++++---- .../g++.dg/cpp1y/lambda-generic-local-class2.C | 13 +++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C base-commit: cd0c433e5faba9a18f64881cd761a53a530aa798 diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 90bcaa78701..40deedc9ba9 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -4069,10 +4069,14 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data) case TAG_DEFN: t = TREE_TYPE (t); if (CLASS_TYPE_P (t)) - /* Local class, need to look through the whole definition. */ - for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t))) - cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r, - ppd, ppd->visited); + { + /* Local class, need to look through the whole definition. + TYPE_BINFO might be unset for a partial instantiation. */ + if (TYPE_BINFO (t)) + for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t))) + cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r, + ppd, ppd->visited); + } else /* Enum, look at the values. */ for (tree l = TYPE_VALUES (t); l; l = TREE_CHAIN (l)) diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C new file mode 100644 index 00000000000..83856de1f41 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C @@ -0,0 +1,13 @@ +// PR c++/109241 +// { dg-do compile { target c++14 } } +// { dg-options "" } no pedantic + +void g() { + [](auto) { + [](auto) { + ({ + struct A {}; + }); + }; + }(1); +}