From patchwork Thu Apr 15 16:42:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1466719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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@gcc.gnu.org; receiver=) Authentication-Results: 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=YITNsFf6; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FLlVy5vdvz9sW1 for ; Fri, 16 Apr 2021 02:42:17 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3704A394FC15; Thu, 15 Apr 2021 16:42:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3704A394FC15 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1618504935; bh=QFF53rFqLQfzHZi2QG+ZLw+xRnpYeVDAiWSjAs5OnR4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=YITNsFf6JffqMv6C/b/mXeOQ98+7fIG0SvODt1YdkI/nqryE628v9Ianl8sjpQ5ga wccF8vm6MwwKjQk9YZYUK00hfUe6dKridpl9QGe2SND7FNPGWbEydr1qmdqvmEGrzC kqLlmN9cIE7phDoRNDtRs/t54ZSs3VWaeJvBEeuI= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id D35FE394D8B4 for ; Thu, 15 Apr 2021 16:42:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D35FE394D8B4 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-257-ANnLRTzbMRyx4LSu7FOSrA-1; Thu, 15 Apr 2021 12:42:10 -0400 X-MC-Unique: ANnLRTzbMRyx4LSu7FOSrA-1 Received: by mail-qk1-f198.google.com with SMTP id n26so1896832qkk.15 for ; Thu, 15 Apr 2021 09:42:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=QFF53rFqLQfzHZi2QG+ZLw+xRnpYeVDAiWSjAs5OnR4=; b=CfVzTIJ4ajMQF+ANqNwcpspWBCrtCQAgD99fjTDFtsQjMoNRtvtNM91XMJvPRA1IpU htsVUTGdY7bnEyZLC2MjAtdnytcApzOWEwNM9nrpmnLpG/E3sMHAEiy+wCzecI0vkU98 vFgGLUaFWBkkfhkk/fvPsV/SZA6FRoThFMhV7h1JT2jOAtx5RXgriQx9/mODZ/fQdWSC f0fzKPVtGGX6eOEv7ZQAtXiKLNRTjI6BqKKwQdcJZL0jmPbj42Ududh1C5KXFc2fWU+I Yo3M9K8SvcacT6Aqnq1nj+vTWzQE3WpRLDL3tvWLX3GzbjegI4v+oMBi1Ei57AWSi9S8 9ohg== X-Gm-Message-State: AOAM532cqUJehf/WcOfjY1LI9wu4GVgI5mOMIQ9K14xIUT9ekkJnDtsD PvzPq4rQKNGHByZB+bPqJCQy/7JjJTZ+oi577cYrSbd5Q6Icp7IBpV7NFSBi/97npZSq5krrFdm DfJYSF5Ffd0rgIF6aG/hOROTdfJ0Z6g7jwygzaDGQI2Z9+UXGKtWXA+qOko+GgVYJFQ== X-Received: by 2002:a05:6214:1866:: with SMTP id eh6mr3965138qvb.29.1618504930072; Thu, 15 Apr 2021 09:42:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzW+gz0RsM/Vvt4l9YSEghg+ngzVVbeylpdFtvY8IEPs/OM7IrldRFwSqO0nxnHFsoRIoG76g== X-Received: by 2002:a05:6214:1866:: with SMTP id eh6mr3965100qvb.29.1618504929633; Thu, 15 Apr 2021 09:42:09 -0700 (PDT) Received: from barrymore.redhat.com (209-6-216-142.s141.c3-0.smr-cbr1.sbo-smr.ma.cable.rcncustomer.com. [209.6.216.142]) by smtp.gmail.com with ESMTPSA id w5sm2323893qkc.85.2021.04.15.09.42.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Apr 2021 09:42:09 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: lambda in default type template-argument [PR100091] Date: Thu, 15 Apr 2021 12:42:06 -0400 Message-Id: <20210415164206.782089-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.5 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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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@gcc.gnu.org Sender: "Gcc-patches" My patch for 99478 relied on local_variables_forbidden_p for distinguishing between a template parameter and its default argument, but that flag wasn't set for a default type template-argument. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog: PR c++/100091 PR c++/99478 * parser.c (cp_parser_default_type_template_argument): Set parser->local_variables_forbidden_p. gcc/testsuite/ChangeLog: PR c++/100091 * g++.dg/cpp2a/lambda-uneval15.C: New test. --- gcc/cp/parser.c | 4 ++++ gcc/testsuite/g++.dg/cpp2a/lambda-uneval15.C | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp2a/lambda-uneval15.C base-commit: b5f644a98b3f3543d3a8d2dfea7785c22879013f diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 3a107206318..940751b5f05 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -16923,6 +16923,10 @@ cp_parser_default_type_template_argument (cp_parser *parser) cp_token *token = cp_lexer_peek_token (parser->lexer); + /* Tell cp_parser_lambda_expression this is a default argument. */ + auto lvf = make_temp_override (parser->local_variables_forbidden_p); + parser->local_variables_forbidden_p = LOCAL_VARS_AND_THIS_FORBIDDEN; + /* Parse the default-argument. */ push_deferring_access_checks (dk_no_deferred); tree default_argument = cp_parser_type_id (parser, diff --git a/gcc/testsuite/g++.dg/cpp2a/lambda-uneval15.C b/gcc/testsuite/g++.dg/cpp2a/lambda-uneval15.C new file mode 100644 index 00000000000..ae72ea3c56b --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/lambda-uneval15.C @@ -0,0 +1,5 @@ +// PR c++/100091 +// { dg-do compile { target c++20 } } + +template +void f() {}