From patchwork Wed May 11 19:30:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 53819 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 497363839C5E for ; Wed, 11 May 2022 19:31:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 497363839C5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652297474; bh=7Rm1XfHk3zBF0xGx+s/4V4HV1BEkz8izdIgmPH+A0ts=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=QiZ4b/of5wjEmW9R1r3HzNGVWi8VJ3n+7jzCizX1V08i8nFfuQx1VKwB/lVKvK+UM nUEto7ZJQBM3KciR0ckafqhYURfwCGEXGzRKO5i+sbZOtawuyPN4eV62eDrZmbLTqF 9NOjwj6FIm391BgB5UbSrJoPV7aQLTSo2r3ADom4= 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 [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 45AF83839C58 for ; Wed, 11 May 2022 19:30:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 45AF83839C58 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-637-Kw3gm6BrOJyuWPnNF477dg-1; Wed, 11 May 2022 15:30:30 -0400 X-MC-Unique: Kw3gm6BrOJyuWPnNF477dg-1 Received: by mail-qk1-f198.google.com with SMTP id a5-20020ae9e805000000b006a034b31384so2554498qkg.8 for ; Wed, 11 May 2022 12:30:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7Rm1XfHk3zBF0xGx+s/4V4HV1BEkz8izdIgmPH+A0ts=; b=jrFAxbBA2Gcd6eaGbFYSxcejSC3MYgSFDt6sPERmdpx5esTZLU0kOQSP4DBdqOGjxK HL+39brP6LxKceQZSiIF/pAaJDrvwMXszH0bgpEEdarUNvhAr0XOqFmj7LY/GEa7dji/ RZsRuP/UHin7/TfBBtASFsI9EfiaiA2IsUvdJvdSn4G51YO7kvTG1RHT2vVn+X1A7FwD kY+xXmduDMkx80tvd4q3KyXq2+RdyRFAOZDu5x/qhsaufKiEBNndcPY3rh4IZmoKIz4z 7/CJdte4Lznq3YCIZ04Pd6lHsQbrm9eXiKlsK6VGUtvB4zc3+yjyqJAvSR6AGUbBkOvi pQ3g== X-Gm-Message-State: AOAM5319rHv4dbK2mw+iAodf3HhRIy8JDCZg6xJgd8fAauGUaRr5Gnn3 jPN4hKqcq1F1tDAToWj0/VDyyAjZdFBW8Rrt16w/vLVT74Hug1oEapwD7t4yaAygEW59IJniMli J+cJ5q0K8zp3tjRu/+OGPIMD87Fkp7uo7Ese15lL24RFC+zWCHpriQibFt7cY+jCr4Q== X-Received: by 2002:ad4:4e05:0:b0:456:50a4:7494 with SMTP id dl5-20020ad44e05000000b0045650a47494mr23766532qvb.6.1652297429793; Wed, 11 May 2022 12:30:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyu+wQ2PkZWvT7UyWBP4+T4Vv9sNgR+Ax/tsrOC5gG+MbAZj6pb7SYkMxoE5p48M/PNkSuPJg== X-Received: by 2002:ad4:4e05:0:b0:456:50a4:7494 with SMTP id dl5-20020ad44e05000000b0045650a47494mr23766498qvb.6.1652297429310; Wed, 11 May 2022 12:30:29 -0700 (PDT) Received: from barrymore.redhat.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id o1-20020ac872c1000000b002f39b99f6b9sm1605940qtp.83.2022.05.11.12.30.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 12:30:27 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: lambda template in requires [PR105541] Date: Wed, 11 May 2022 15:30:26 -0400 Message-Id: <20220511193026.3473622-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=-13.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_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Since the patch for PR103408, the template parameters for the lambda in this test have level 1 instead of 2, and we were treating null template args as 1 level of arguments, so tsubst_template_parms decided it had nothing to do. Fixed by distinguishing between <> and no args at all, which is what we have in our "substitution" in a requires-expression. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/105541 gcc/cp/ChangeLog: * cp-tree.h (TMPL_ARGS_DEPTH): 0 for null args. * parser.cc (cp_parser_enclosed_template_argument_list): Use 0-length TREE_VEC for <>. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/lambda-requires1.C: New test. --- gcc/cp/cp-tree.h | 12 +++++++----- gcc/cp/parser.cc | 5 ++++- gcc/testsuite/g++.dg/cpp2a/lambda-requires1.C | 4 ++++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/lambda-requires1.C base-commit: 4dc86f716fe6087f1cf786d69c0c6f3f5af810f0 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index e16b8d70846..b6961a796af 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3771,11 +3771,13 @@ struct GTY(()) lang_decl { /* The depth of a template argument vector. When called directly by the parser, we use a TREE_LIST rather than a TREE_VEC to represent - template arguments. In fact, we may even see NULL_TREE if there - are no template arguments. In both of those cases, there is only - one level of template arguments. */ -#define TMPL_ARGS_DEPTH(NODE) \ - (TMPL_ARGS_HAVE_MULTIPLE_LEVELS (NODE) ? TREE_VEC_LENGTH (NODE) : 1) + template arguments. In that case, there is only one level of template + arguments. We may even see NULL_TREE if there are 0 levels of + template arguments, as in cp_parser_requires_expression. */ +#define TMPL_ARGS_DEPTH(NODE) \ + ((NODE) == NULL_TREE ? 0 \ + : TMPL_ARGS_HAVE_MULTIPLE_LEVELS (NODE) ? TREE_VEC_LENGTH (NODE) \ + : 1) /* The LEVELth level of the template ARGS. The outermost level of args is level 1, not level 0. */ diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc index 4ed9feaa427..d09d5b7c8b7 100644 --- a/gcc/cp/parser.cc +++ b/gcc/cp/parser.cc @@ -32151,7 +32151,10 @@ cp_parser_enclosed_template_argument_list (cp_parser* parser) || cp_lexer_next_token_is (parser->lexer, CPP_RSHIFT) || cp_lexer_next_token_is (parser->lexer, CPP_GREATER_EQ) || cp_lexer_next_token_is (parser->lexer, CPP_RSHIFT_EQ)) - arguments = NULL_TREE; + { + arguments = make_tree_vec (0); + SET_NON_DEFAULT_TEMPLATE_ARGS_COUNT (arguments, 0); + } else arguments = cp_parser_template_argument_list (parser); /* Look for the `>' that ends the template-argument-list. If we find diff --git a/gcc/testsuite/g++.dg/cpp2a/lambda-requires1.C b/gcc/testsuite/g++.dg/cpp2a/lambda-requires1.C new file mode 100644 index 00000000000..fdfdaebcf6a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/lambda-requires1.C @@ -0,0 +1,4 @@ +// PR c++/105541 +// { dg-do compile { target c++20 } } + +static_assert(requires { []{}; });