From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id AB4F63856DC0; Sat, 22 Apr 2023 00:23:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AB4F63856DC0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682122982; bh=m1t8gASWNyMLPXyqGJZY63iad0b+qphZn/Sf9DH627E=; h=From:To:Subject:Date:From; b=TY3Le+NMqeDNrQgh2H3YMwsnqmth5n4B6i52HoSI6XZL7qA6OX8F/19ZuejLXrvak xJCTwt2suZwzSCdReStNnrMoCQbReKNAd3KuA4GxKALKYMFmaFrIXULHFDhwlR84VB 4RcAkfplbpVinBQcCZxZRr8fBQfeWLyNSD7+SORI= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-10645] c++: constant, array, lambda, template [PR108975] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: fbf72bbaed4477f1e3881a8d25977dd3890015eb X-Git-Newrev: 51738bb097444dd3ca7adcfa28ae8dcff5a14c50 Message-Id: <20230422002302.AB4F63856DC0@sourceware.org> Date: Sat, 22 Apr 2023 00:23:02 +0000 (GMT) List-Id: https://gcc.gnu.org/g:51738bb097444dd3ca7adcfa28ae8dcff5a14c50 commit r11-10645-g51738bb097444dd3ca7adcfa28ae8dcff5a14c50 Author: Jason Merrill Date: Fri Mar 17 17:26:40 2023 -0400 c++: constant, array, lambda, template [PR108975] When a lambda refers to a constant local variable in the enclosing scope, we tentatively capture it, but if we end up pulling out its constant value, we go back at the end of the lambda and prune any unneeded captures. Here while parsing the template we decided that the dim capture was unneeded, because we folded it away, but then we brought back the use in the template trees that try to preserve the source representation with added type info. So then when we tried to instantiate that use, we couldn't find what it was trying to use, and crashed. Fixed by not trying to prune when parsing a template; we'll prune at instantiation time. PR c++/108975 gcc/cp/ChangeLog: * lambda.c (prune_lambda_captures): Don't bother in a template. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/lambda/lambda-const11.C: New test. Diff: --- gcc/cp/lambda.c | 3 +++ gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const11.C | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/gcc/cp/lambda.c b/gcc/cp/lambda.c index 1508e232091..bc849beef41 100644 --- a/gcc/cp/lambda.c +++ b/gcc/cp/lambda.c @@ -1559,6 +1559,9 @@ prune_lambda_captures (tree body) if (LAMBDA_EXPR_DEFAULT_CAPTURE_MODE (lam) == CPLD_NONE) /* No default captures, and we don't prune explicit captures. */ return; + /* Don't bother pruning in a template, we'll prune at instantiation time. */ + if (dependent_type_p (TREE_TYPE (lam))) + return; hash_map const_vars; diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const11.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const11.C new file mode 100644 index 00000000000..26af75bf132 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-const11.C @@ -0,0 +1,14 @@ +// PR c++/108975 +// { dg-do compile { target c++11 } } + +template +void f() { + constexpr int dim = 1; + auto l = [&] { + int n[dim * 1]; + }; + // In f, we shouldn't actually capture dim. + static_assert (sizeof(l) == 1, ""); +} + +template void f();