From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id DE92F386C585 for ; Tue, 25 Jun 2024 02:12:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DE92F386C585 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DE92F386C585 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719281579; cv=none; b=sG3JcAlQSKWM6rRFUaRofZw+a90WlDRHrv+VUzB+p+O2rSSccoBUfkyasc8wFlo7AvGC5CVVH5VYPxiaNKHvOZ5J2WBKRmHWSPd3flSHXf8c0N5zi9v+n69dEAjVxwtprjf7YhFyydOTJ1E3E0hm/bFCzUl+crBcZZ1wrQ6Skoo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719281579; c=relaxed/simple; bh=S/vFR1iqwlT5CpT30XvaTHvYpr4qaDf8Rp8ZvXH38tg=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=vZhoBgSTOOCGO+tuNZtQL1p7JywmiEvPSR/kUtJvlyWvxeT9SNhEgwQoV4AAIcdpr9KouVp39WeXdn5m75d3W2ShD0w/ZMKIytUeAtpOmOdN1lWi4nuBMZDAOBbEzOLXLvR2n31Fe7WYfuqzJ0rQHWLjOp0KsRMK43k51mipUmE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719281576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P/ccXx94CsSthcnWj9RXD96BVFCVO2+HJO3qAqGbluk=; b=dmONgzQjs53+iUSwwa2/lxzYLUjZIGWY6GiqijYZsC8yBNZF4aUa0uhlBFKJCETyEdo65z 7dS/dM43Z6+NhfTVhNSnfZ9dg+g5eF4h24QhaJePmawuhLHV8wr1Im156FYfNtbBk9oI5g GebwDM54HhXrlq6AD73jCh5crb7G6CU= Received: from mail-yw1-f197.google.com (mail-yw1-f197.google.com [209.85.128.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-459-Ipa7RoQ-PSqSImoqkU1cqw-1; Mon, 24 Jun 2024 22:12:52 -0400 X-MC-Unique: Ipa7RoQ-PSqSImoqkU1cqw-1 Received: by mail-yw1-f197.google.com with SMTP id 00721157ae682-62f43c95de4so113588267b3.3 for ; Mon, 24 Jun 2024 19:12:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719281571; x=1719886371; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=P/ccXx94CsSthcnWj9RXD96BVFCVO2+HJO3qAqGbluk=; b=lzd3H2grE+CMIaHK3U2YBpe+pvqQuJWepSc4f3YNCxuMf4woC1YdbeTblcFPGWi4cz ezT85/VWoQowkS1P7nlRfwAb8NppwamahWAzm4S1lJG/hT2ARIuuu68wJMPgrzDxB/KY 847soax6vhaDW0Wo0yGDg3B2XxcPZl6I76hOYGsQDhJZ7GuolFF9zriCsx4JSo6Kncxt u4GMWUUq/Ty2s9qCbONJuCRUAD96imcm3GB+XTfe1BXwJQ6h1JYaMaYdXRNa78tgP0Bo WECqjXis4vvbWUYvJ88HBibOyQiKT6SKU+q0CIfYXhLvEpUrSg9cROWJ+aW0opj9Uwbb dSYQ== X-Forwarded-Encrypted: i=1; AJvYcCV9bd3l/TOKfwuUoBNZcWldDMTYHHsyDcC9PGgmHMks1j10cEWwaEot2oV/ZkUdZJcJ4iB9UbOkZ/QB/oZ3kLPCQZTy04LOWw== X-Gm-Message-State: AOJu0Yx8kPv3CNJg+R/oLeXwAjKYdw7B+SBqsHh8Mq/C0p0lnsHZYEpa mud5UuCbO2/CdzHGOWin83VbY5Mz8K8fmVZraPEjccjmbJFTllAi/n+argZ6gU91/fmPEBNYG48 bMf9+75gnms64Dl5g559RJZAoano8A7JWojbCeIM7a0yPDG/SdPoOShY= X-Received: by 2002:a81:cb0d:0:b0:61a:e4ef:51d with SMTP id 00721157ae682-6429877b6dbmr66510867b3.9.1719281571466; Mon, 24 Jun 2024 19:12:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGOSFNtsX11Yt0KSx+nz23vX19OjgOxQzZjkZIkTsYUw84be57SAxATe/jhq+ZdysDM0iv4g== X-Received: by 2002:a81:cb0d:0:b0:61a:e4ef:51d with SMTP id 00721157ae682-6429877b6dbmr66510767b3.9.1719281571130; Mon, 24 Jun 2024 19:12:51 -0700 (PDT) Received: from [192.168.1.130] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b51ed29564sm39824156d6.45.2024.06.24.19.12.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Jun 2024 19:12:50 -0700 (PDT) Message-ID: Date: Mon, 24 Jun 2024 22:12:49 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] c++: ICE with generic lambda and pack expansion [PR115425] To: Marek Polacek , GCC Patches References: <20240617181729.33445-1-polacek@redhat.com> From: Jason Merrill In-Reply-To: <20240617181729.33445-1-polacek@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.4 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_H4,RCVD_IN_MSPIKE_WL,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 List-Id: On 6/17/24 14:17, Marek Polacek wrote: > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? OK. > -- >8 -- > In r13-272 we hardened the *_PACK_EXPANSION and *_ARGUMENT_PACK macros. > That trips up here because make_pack_expansion returns error_mark_node > and we access that with PACK_EXPANSION_LOCAL_P. > > PR c++/115425 > > gcc/cp/ChangeLog: > > * pt.cc (tsubst_pack_expansion): Return error_mark_node if > make_pack_expansion doesn't work out. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp2a/lambda-generic12.C: New test. > --- > gcc/cp/pt.cc | 2 ++ > gcc/testsuite/g++.dg/cpp2a/lambda-generic12.C | 25 +++++++++++++++++++ > 2 files changed, 27 insertions(+) > create mode 100644 gcc/testsuite/g++.dg/cpp2a/lambda-generic12.C > > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > index 607753ae6b7..e676372f75b 100644 > --- a/gcc/cp/pt.cc > +++ b/gcc/cp/pt.cc > @@ -13775,6 +13775,8 @@ tsubst_pack_expansion (tree t, tree args, tsubst_flags_t complain, > else > result = tsubst (pattern, args, complain, in_decl); > result = make_pack_expansion (result, complain); > + if (result == error_mark_node) > + return error_mark_node; > PACK_EXPANSION_LOCAL_P (result) = PACK_EXPANSION_LOCAL_P (t); > PACK_EXPANSION_SIZEOF_P (result) = PACK_EXPANSION_SIZEOF_P (t); > if (PACK_EXPANSION_AUTO_P (t)) > diff --git a/gcc/testsuite/g++.dg/cpp2a/lambda-generic12.C b/gcc/testsuite/g++.dg/cpp2a/lambda-generic12.C > new file mode 100644 > index 00000000000..219529c7c32 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp2a/lambda-generic12.C > @@ -0,0 +1,25 @@ > +// PR c++/115425 > +// { dg-do compile { target c++20 } } > + > +using size_t = decltype(sizeof(0)); > + > +template > +struct X {}; > + > +template > +void foo(X); > + > +template > +struct S; > + > +template > +auto test() { > + constexpr static auto x = foo>(); // { dg-error "no matching function" } > + return [](X) { > + (typename S::type{}, ...); > + }(X<__integer_pack (0)...>{}); > +} > + > +int main() { > + test(); > +} > > base-commit: b63c7d92012f92e0517190cf263d29bbef8a06bf