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.133.124]) by sourceware.org (Postfix) with ESMTPS id 465AC385828E for ; Fri, 17 Feb 2023 22:42:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 465AC385828E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676673773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Su155zV2szUQizFtPrMSXxcGS7WAnT0tt3hXcqRmwwc=; b=T5JdTbW11ADpUr4yjier1mm76Y1up6x6L/Ym8GFLZ6NaFGrnlnjE3CCln/NYt5cFQ6SrR2 9g4jyyne8m1xiF7U4n0CqyfJMxMRKKWdZqM14X+tFNfVddz7g2NdsAW0O0cPJPQDTHm++J I0/x7Ops0qXLjVqGY+JMrosgtH/mbj0= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-172-lHnL32d8M_-X6za7NJfP-w-1; Fri, 17 Feb 2023 17:42:52 -0500 X-MC-Unique: lHnL32d8M_-X6za7NJfP-w-1 Received: by mail-qv1-f69.google.com with SMTP id y19-20020ad457d3000000b0056ea549d728so1340768qvx.10 for ; Fri, 17 Feb 2023 14:42:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Su155zV2szUQizFtPrMSXxcGS7WAnT0tt3hXcqRmwwc=; b=8ROawo45ofC/EKjMNqb8r5vh7sN9ZjTeiwl/RxWXAMFzx2QQHGWhVzEmE2zjzz/bWw f4z6M42ttYSOTjDesoDNtED3X152en3JEJH7VXxlQCd+w5rhubx6PNg8jqIAk+z8Hha0 2qlLp2H4TGNRdVFpQ2dhI0i7O9k+MkY03DI5Tzc4GTsxUWoCzFMLByrY0c9uRE0OSgMb jnoia4ZZqPaAeR/mr7t6VX8iYjWpVXcoXPP0HHFXK+mrvnA7RC6SuUbS3t61S7I/ejcE c5nFOZVgUNsY7hFwbygUYiy/ILfIqxXeUGunFx1Y4+6dR5K5+UjkCukKXydoHC8zOR9T v8MA== X-Gm-Message-State: AO0yUKW/P4mERRaHAYOiOp7TEUwyqITaDORoaQ1ciccdUrV+kwE5PRHF UMMsAZRYUt2dtZuG6xEUBJVc5dv8/igyuEUSx1QjRpH4LGTrDarQpPIm2RDiYYJosgN3465tcck cVKBH15ls6KDJCC6hTgT7JLY= X-Received: by 2002:ad4:5de1:0:b0:56e:fbd5:8dfb with SMTP id jn1-20020ad45de1000000b0056efbd58dfbmr11801946qvb.12.1676673771963; Fri, 17 Feb 2023 14:42:51 -0800 (PST) X-Google-Smtp-Source: AK7set/XeB2cfA2sFjiVx3YoEwr/XvyXDElPCC+JFR4fQ2E7AkphNTx44YtoP7gha2DHjeoL+NcEMA== X-Received: by 2002:ad4:5de1:0:b0:56e:fbd5:8dfb with SMTP id jn1-20020ad45de1000000b0056efbd58dfbmr11801926qvb.12.1676673771662; Fri, 17 Feb 2023 14:42:51 -0800 (PST) Received: from redhat.com (2603-7000-9500-34a5-0000-0000-0000-1db4.res6.spectrum.com. [2603:7000:9500:34a5::1db4]) by smtp.gmail.com with ESMTPSA id t80-20020a374653000000b007203bbbbb31sm4125783qka.47.2023.02.17.14.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 14:42:50 -0800 (PST) Date: Fri, 17 Feb 2023 17:42:49 -0500 From: Marek Polacek To: Patrick Palka Cc: Jason Merrill , GCC Patches Subject: [PATCH v3] c++: ICE with redundant capture [PR108829] Message-ID: References: <20230217185847.33102-1-polacek@redhat.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/2.2.9 (2022-11-12) X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-12.7 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 List-Id: On Fri, Feb 17, 2023 at 04:32:50PM -0500, Patrick Palka wrote: > On Fri, 17 Feb 2023, Patrick Palka wrote: > > > On Fri, 17 Feb 2023, Marek Polacek wrote: > > > > > On Fri, Feb 17, 2023 at 03:00:39PM -0500, Patrick Palka wrote: > > > > On Fri, 17 Feb 2023, Marek Polacek via Gcc-patches wrote: > > > > > > > > > Here we crash in is_capture_proxy: > > > > > > > > > > /* Location wrappers should be stripped or otherwise handled by the > > > > > caller before using this predicate. */ > > > > > gcc_checking_assert (!location_wrapper_p (decl)); > > > > > > > > > > so fixed as the comment suggests. We only crash with the redundant > > > > > capture: > > > > > > > > > > int abyPage = [=, abyPage] { ... } > > > > > > > > > > because prune_lambda_captures is only called when there was a default > > > > > capture, and with [=] only abyPage won't be in LAMBDA_EXPR_CAPTURE_LIST. > > > > > > > > It's weird that we even get this far in var_to_maybe_prune. Shouldn't > > > > LAMBDA_CAPTURE_EXPLICIT_P be true for abyPage? > > > > > > Ug, I was seduced by the ostensible obviousness and failed to notice > > > that check. In that light, the correct fix ought to be this. Thanks! > > > > > > Bootstrap/regtest running on x86_64-pc-linux-gnu, ok for trunk if it > > > passes? > > > > > > -- >8 -- > > > Here we crash in is_capture_proxy: > > > > > > /* Location wrappers should be stripped or otherwise handled by the > > > caller before using this predicate. */ > > > gcc_checking_assert (!location_wrapper_p (decl)); > > > > > > We only crash with the redundant capture: > > > > > > int abyPage = [=, abyPage] { ... } > > > > > > because prune_lambda_captures is only called when there was a default > > > capture, and with [=] only abyPage won't be in LAMBDA_EXPR_CAPTURE_LIST. > > > > > > The problem is that LAMBDA_CAPTURE_EXPLICIT_P wasn't propagated > > > correctly and so var_to_maybe_prune proceeded where it shouldn't. > > > > > > PR c++/108829 > > > > > > gcc/cp/ChangeLog: > > > > > > * pt.cc (tsubst_lambda_expr): Propagate LAMBDA_CAPTURE_EXPLICIT_P. > > > > > > gcc/testsuite/ChangeLog: > > > > > > * g++.dg/cpp0x/lambda/lambda-108829.C: New test. > > > --- > > > gcc/cp/pt.cc | 4 ++++ > > > gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829.C | 11 +++++++++++ > > > 2 files changed, 15 insertions(+) > > > create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829.C > > > > > > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > > > index b1ac7d4beb4..f747ce877b5 100644 > > > --- a/gcc/cp/pt.cc > > > +++ b/gcc/cp/pt.cc > > > @@ -19992,6 +19992,10 @@ tsubst_lambda_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) > > > if (id_equal (DECL_NAME (field), "__this")) > > > LAMBDA_EXPR_THIS_CAPTURE (r) = field; > > > } > > > + > > > + if (LAMBDA_EXPR_CAPTURE_LIST (r)) > > > + LAMBDA_CAPTURE_EXPLICIT_P (LAMBDA_EXPR_CAPTURE_LIST (r)) > > > + = LAMBDA_CAPTURE_EXPLICIT_P (LAMBDA_EXPR_CAPTURE_LIST (t)); > > > > I'm not sure how the flag works for pack captures but it looks like > > this would only propagate the flag to the last expanded capture if > > the capture was originally a pack. > > Testcase: > > template > void f(Ts... ts) { > constexpr int IDX_PAGE_SIZE = 4096; > int abyPage = [=, ts...] { return IDX_PAGE_SIZE; }(); > } > void h() { > f<1>(0, 1); > } Thanks a lot for the testacase. Revised patch below. Look OK? Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? -- >8 -- Here we crash in is_capture_proxy: /* Location wrappers should be stripped or otherwise handled by the caller before using this predicate. */ gcc_checking_assert (!location_wrapper_p (decl)); We only crash with the redundant capture: int abyPage = [=, abyPage] { ... } because prune_lambda_captures is only called when there was a default capture, and with [=] only abyPage won't be in LAMBDA_EXPR_CAPTURE_LIST. The problem is that LAMBDA_CAPTURE_EXPLICIT_P wasn't propagated correctly and so var_to_maybe_prune proceeded where it shouldn't. PR c++/108829 gcc/cp/ChangeLog: * pt.cc (prepend_one_capture): Set LAMBDA_CAPTURE_EXPLICIT_P. (tsubst_lambda_expr): Pass LAMBDA_CAPTURE_EXPLICIT_P to prepend_one_capture. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/lambda/lambda-108829-2.C: New test. * g++.dg/cpp0x/lambda/lambda-108829.C: New test. Co-Authored by: Patrick Palka --- gcc/cp/pt.cc | 9 ++++++--- gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829-2.C | 11 +++++++++++ gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829.C | 11 +++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829-2.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index b1ac7d4beb4..1a071e95004 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -19870,10 +19870,11 @@ tsubst_non_call_postfix_expression (tree t, tree args, /* Subroutine of tsubst_lambda_expr: add the FIELD/INIT capture pair to the LAMBDA_EXPR_CAPTURE_LIST passed in LIST. Do deduction for a previously - dependent init-capture. */ + dependent init-capture. EXPLICIT_P is true if the original list had + explicit captures. */ static void -prepend_one_capture (tree field, tree init, tree &list, +prepend_one_capture (tree field, tree init, tree &list, bool explicit_p, tsubst_flags_t complain) { if (tree auto_node = type_uses_auto (TREE_TYPE (field))) @@ -19893,6 +19894,7 @@ prepend_one_capture (tree field, tree init, tree &list, cp_apply_type_quals_to_decl (cp_type_quals (type), field); } list = tree_cons (field, init, list); + LAMBDA_CAPTURE_EXPLICIT_P (list) = explicit_p; } /* T is a LAMBDA_EXPR. Generate a new LAMBDA_EXPR for the current @@ -19982,12 +19984,13 @@ tsubst_lambda_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) prepend_one_capture (TREE_VEC_ELT (field, i), TREE_VEC_ELT (init, i), LAMBDA_EXPR_CAPTURE_LIST (r), + LAMBDA_CAPTURE_EXPLICIT_P (cap), complain); } else { prepend_one_capture (field, init, LAMBDA_EXPR_CAPTURE_LIST (r), - complain); + LAMBDA_CAPTURE_EXPLICIT_P (cap), complain); if (id_equal (DECL_NAME (field), "__this")) LAMBDA_EXPR_THIS_CAPTURE (r) = field; diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829-2.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829-2.C new file mode 100644 index 00000000000..4e24470514d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829-2.C @@ -0,0 +1,11 @@ +// PR c++/108829 +// { dg-do compile { target c++11 } } + +template +void f(Ts... ts) { + constexpr int IDX_PAGE_SIZE = 4096; + int abyPage = [=, ts...] { return IDX_PAGE_SIZE; }(); // { dg-error "redundant" } +} +void h() { + f<1>(0, 1); +} diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829.C new file mode 100644 index 00000000000..e621a0d14d0 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-108829.C @@ -0,0 +1,11 @@ +// PR c++/108829 +// { dg-do compile { target c++11 } } + +template +void f(void) { + constexpr int IDX_PAGE_SIZE = 4096; + int abyPage = [=, abyPage] { return IDX_PAGE_SIZE; }(); // { dg-error "redundant" } +} +void h() { + f<1>(); +} base-commit: 5fea1be820508e1fbc610d1a54b61c1add33c36f -- 2.39.2