From patchwork Mon Jan 6 12:23:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathaniel Shead X-Patchwork-Id: 104168 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 89C0C3858C33 for ; Mon, 6 Jan 2025 12:27:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89C0C3858C33 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Kyw6KGT/ X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id 83C10385842A for ; Mon, 6 Jan 2025 12:24:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 83C10385842A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 83C10385842A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::636 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736166247; cv=none; b=coWqr/i07dWh45f47wN4O2l4jlOAyki9R0yYyRMSfq7N31si2lLVaTmJLqX/IUEg9f8shbvj3BSNmSY/IQjvp0zKxdlieIsvhPlKtQIYeS9SchYlurhvFBK4U6l9UFtvmVTohL7B3mFctStEzcvZVHsQOWF5Vy6nTBgKkCNTtrM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736166247; c=relaxed/simple; bh=aAu1guWeT6Odk9Um+5hyd8y9R4sj3iWS8QpQT5Xs8LY=; h=DKIM-Signature:Message-ID:Date:From:To:Subject:MIME-Version; b=azeeojlohSkJhKAZvL6682JZh5/XTdm9iml4iRf+AfGVXhwDsmYvjDx3Bud775pgqoSqJzk/48F1kfo0oqz0oHsGoZP+Y5uw9xTKISzkVG4AGSHqnanxUleOS1DE/sjfD3TEoyUtB6QJXRQIyLsDoR3FhZMEA5qRCnLhDDwU0Z8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-21644b473ddso21284175ad.0 for ; Mon, 06 Jan 2025 04:24:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736166236; x=1736771036; darn=gcc.gnu.org; h=in-reply-to:content-disposition:mime-version:references:subject:cc :to:from:date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=TlUcnOqjHyHSPKD4T5hDUAYA8kpVz3l4vgvph2XIR/Y=; b=Kyw6KGT/FZy14RtTu8chxttW2CR7ti9gdlI4z8GPvTaf2nZLxLpETVZ1scnpTK0BCF yTq1G6qqoesuk7kjakVvRx1hdapeeNAk30dFdcAoLczO47LIJ6XUn0AIuBYNeQu+fyNZ 1dbIsD2NgtYFiTci6YmHB6KkC4QC/dn5z019iFTCBeeoisz4e7YNtgmSeEYhjx+GoxJi O1uox1quaXQfksgNUa7lTSLVd3Tbhydv3/P6FplHn1vbibs+9S9/2NUm99koQBVlsfXV auSl2BE7olL02TpAEFjfzJ/SbvpIQyKh1bR2ATS8oMBjHtxKEVhz31nvcReG1FbZg5hg qcjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736166236; x=1736771036; h=in-reply-to:content-disposition:mime-version:references:subject:cc :to:from:date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TlUcnOqjHyHSPKD4T5hDUAYA8kpVz3l4vgvph2XIR/Y=; b=B9ZS99UdOrfC24NnCXrh/DIGgpDOkOOWzpzhADLdqhvCyJ8jMuVyNYKimBFEdDE+2X 6FqkHTi2ydY8dh6Yf+pGG4fyKhazfv0ygye3IpHjRhQW/7QeqmjnlbKEiryRvJawsjFM hUF9hLXKc8dXCJuxBhDj9n47dTOF4Lc17UhnuUFBxT+lL9LlTPZ4ln2v/7/ETFtM8pr4 WU3r027KCJDxFo5lCsBBF4kTdsn8o3XGHb8scf4guPAJ89fmu7+ThwjDfQ0DO4cIlxAd MqwX16MtQVNmKibP165yxD7kb34vDwr0x27fEZ3/TR3D80Yd088aNjrUjlI9fsSwvxiH lDkQ== X-Gm-Message-State: AOJu0YzTmbzvBUx9ZFOQA+Lr77M/OobqWVgq+5RMMpoKICT//9CA6h9T n/b5jF2yqpBVWwx5k9F+BwO45ZdtHfrNAgL0cQGoQoGpSzr1ZgNpB6+RCg== X-Gm-Gg: ASbGncvsRyxr3QlXUEFiezYgXHvnQlgW0DhbFSXWRGcXXjYFZUr44/MWOl4Zdns1bX9 9bezwF/CG4CA332d1Bfmc3iIRrIvN1/m1IkY61270r7luKfgr5X9wJduL69k/d5WYUO55ZhDaUk 9rx14Pa36MPtm6AYAZp5c9k9BtArP/q6iaf1piPMbUJSQEur/12djPIru7Ts34BKfDZarnrId/W ra80cjSQLv23h2XHvmdmyfcyBuXM4SIaQoSeVmUok2f2w2Oh66b6a5BA3MzKxl/YRjvklcVIc2F PWLdBhYrxmBDnWfGS3nqqg== X-Google-Smtp-Source: AGHT+IGNQfQ47WTyQTOg4U83AqJKzYYtzgF7K8ANRNtUgk8zOt4Bry/bnuh6tAToXvWdXXHrlL424A== X-Received: by 2002:a17:903:2a8c:b0:216:2dc4:50bf with SMTP id d9443c01a7336-219e6e9a450mr312647185ad.6.1736166236444; Mon, 06 Jan 2025 04:23:56 -0800 (PST) Received: from Thaum. (163-47-68-2.ipv4.originbroadband.com.au. [163.47.68.2]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9cddb1sm289354265ad.139.2025.01.06.04.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 04:23:55 -0800 (PST) Message-ID: <677bcb5b.170a0220.182ee4.f964@mx.google.com> X-Google-Original-Message-ID: Date: Mon, 6 Jan 2025 23:23:51 +1100 From: Nathaniel Shead To: gcc-patches@gcc.gnu.org Cc: Jason Merrill Subject: [PATCH v3 5/6] c++/modules: Add testcase for fixed ICE [PR116568] References: <677bca93.050a0220.33acbc.5415@mx.google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <677bca93.050a0220.33acbc.5415@mx.google.com> X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org This ICE was fixed by ensuring that the lambdas had LAMBDA_EXPR_EXTRA_SCOPE properly set. PR c++/116568 gcc/testsuite/ChangeLog: * g++.dg/modules/lambda-8.h: New test. * g++.dg/modules/lambda-8_a.H: New test. * g++.dg/modules/lambda-8_b.C: New test. Signed-off-by: Nathaniel Shead --- gcc/testsuite/g++.dg/modules/lambda-8.h | 7 +++++++ gcc/testsuite/g++.dg/modules/lambda-8_a.H | 5 +++++ gcc/testsuite/g++.dg/modules/lambda-8_b.C | 5 +++++ 3 files changed, 17 insertions(+) create mode 100644 gcc/testsuite/g++.dg/modules/lambda-8.h create mode 100644 gcc/testsuite/g++.dg/modules/lambda-8_a.H create mode 100644 gcc/testsuite/g++.dg/modules/lambda-8_b.C diff --git a/gcc/testsuite/g++.dg/modules/lambda-8.h b/gcc/testsuite/g++.dg/modules/lambda-8.h new file mode 100644 index 00000000000..0c66f053b20 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/lambda-8.h @@ -0,0 +1,7 @@ +template struct S { + template static constexpr auto x = []{}; + template using t = decltype([]{}); +}; + +inline auto x = S::x; +using t = S::t; diff --git a/gcc/testsuite/g++.dg/modules/lambda-8_a.H b/gcc/testsuite/g++.dg/modules/lambda-8_a.H new file mode 100644 index 00000000000..d20958ee140 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/lambda-8_a.H @@ -0,0 +1,5 @@ +// PR c++/116568 +// { dg-additional-options "-fmodules-ts -std=c++20" } +// { dg-module-cmi {} } + +#include "lambda-8.h" diff --git a/gcc/testsuite/g++.dg/modules/lambda-8_b.C b/gcc/testsuite/g++.dg/modules/lambda-8_b.C new file mode 100644 index 00000000000..05ea4afd8c1 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/lambda-8_b.C @@ -0,0 +1,5 @@ +// PR c++/116568 +// { dg-additional-options "-fmodules-ts -std=c++20" } + +#include "lambda-8.h" +import "lambda-8_a.H";