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.129.124]) by sourceware.org (Postfix) with ESMTPS id 17290383E690 for ; Fri, 27 May 2022 18:05:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 17290383E690 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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-17-IaF640fPP5mLnJFyJAECcg-1; Fri, 27 May 2022 14:05:47 -0400 X-MC-Unique: IaF640fPP5mLnJFyJAECcg-1 Received: by mail-qv1-f69.google.com with SMTP id kj4-20020a056214528400b0044399a9bb4cso4075296qvb.15 for ; Fri, 27 May 2022 11:05:47 -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:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=A3qE5Efytx7mwXG9EapP8b5EV+dSjfyb2bwKE++A3Ic=; b=l+9m8nRBKez6ETiQ0iS1A8yoGlVfvNAELYKBMmlOh5NQjABcs8qvHQ0wd4BmdFSowJ 5uZHugUfRJa4ku6RCRipdR7pZ0xbr3pCJBP6OYAs5EvdyVmvQ7H8jNo8qBOHFd+7av8U BJAbVbNf96Cr0ffBNU8Gk6extSb/pMOkC9zVNnE4DUyikBwm7z3Ir9mYcGoIIfLVAUOM C3xnTLhV0ND6+jY8BEsMSjt1GZ9yMGee2ceJY5NDgMDBijiuUZeAnKBXwDlsq3Sw05aX 73jZGDmhJNHoEhICw2nne1dOXqyv6m9Ev8iezdgtwOcGl4b2n6CFCzxfmoDW/DngWucc Rumg== X-Gm-Message-State: AOAM5334huW4Ax/3y4Xdt3dvSqfoMU0mhSI/WU/OUWMoTUmb8Jgg9Q7C G6IQh+I3vuiY/aLXXGwUKgjamnRVVZjRpi7WyoYloGUfnXEOEmFpwI5YuYZRq/T9VMHSroxakNW SF87GT6Nhmg0ZFZwnNxAe/rSssqcK88Rho7KLKhxM8/EtYvtbTtyQDEcVIkpeO52COkg= X-Received: by 2002:a05:620a:b43:b0:6a0:92b9:8199 with SMTP id x3-20020a05620a0b4300b006a092b98199mr28744506qkg.710.1653674746229; Fri, 27 May 2022 11:05:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyc6XaG/XBvMKve3ASoT40KjDG8UmZjvg2TemkaZgqIRvV6yvD+0Cg+LUfiTBg6dS1V+Tneg== X-Received: by 2002:a05:620a:b43:b0:6a0:92b9:8199 with SMTP id x3-20020a05620a0b4300b006a092b98199mr28744467qkg.710.1653674745799; Fri, 27 May 2022 11:05:45 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id y9-20020ac87089000000b002f9114d2ebcsm2812292qto.17.2022.05.27.11.05.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 11:05:45 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Subject: [PATCH] c++: don't substitute TEMPLATE_PARM_CONSTRAINT [PR100374] Date: Fri, 27 May 2022 14:05:43 -0400 Message-Id: <20220527180543.2908762-1-ppalka@redhat.com> X-Mailer: git-send-email 2.36.1.195.g8ddf593a25 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-14.3 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, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2022 18:05:50 -0000 This makes us avoid substituting into the TEMPLATE_PARM_CONSTRAINT of each template parameter except as necessary for (friend) declaration matching, like we already do for the overall TEMPLATE_PARMS_CONSTRAINTS of a template parameter list. Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk and perhaps 12.2? Also tested on range-v3 and cmcstl2. PR c++/100374 gcc/cp/ChangeLog: * pt.cc (tsubst_each_template_parm_constraint): Define. (tsubst_friend_function): Use it. (tsubst_friend_class): Use it. (tsubst_template_parm): Don't substitute TEMPLATE_PARM_CONSTRAINT. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/concepts-template-parm11.C: New test. --- gcc/cp/pt.cc | 35 ++++++++++++++++--- .../g++.dg/cpp2a/concepts-template-parm11.C | 16 +++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-template-parm11.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 24bbe2f4060..ec168234325 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -184,6 +184,7 @@ static int unify_pack_expansion (tree, tree, tree, tree, unification_kind_t, bool, bool); static tree copy_template_args (tree); static tree tsubst_template_parms (tree, tree, tsubst_flags_t); +static void tsubst_each_template_parm_constraint (tree, tree, tsubst_flags_t); tree most_specialized_partial_spec (tree, tsubst_flags_t); static tree tsubst_aggr_type (tree, tree, tsubst_flags_t, tree, int); static tree tsubst_arg_types (tree, tree, tree, tsubst_flags_t, tree); @@ -11254,7 +11255,12 @@ tsubst_friend_function (tree decl, tree args) tree parms = DECL_TEMPLATE_PARMS (new_friend); tree treqs = TEMPLATE_PARMS_CONSTRAINTS (parms); treqs = maybe_substitute_reqs_for (treqs, new_friend); - TEMPLATE_PARMS_CONSTRAINTS (parms) = treqs; + if (treqs != TEMPLATE_PARMS_CONSTRAINTS (parms)) + { + TEMPLATE_PARMS_CONSTRAINTS (parms) = treqs; + /* As well as each TEMPLATE_PARM_CONSTRAINT. */ + tsubst_each_template_parm_constraint (parms, args, tf_warning_or_error); + } } /* The mangled name for the NEW_FRIEND is incorrect. The function @@ -11500,6 +11506,8 @@ tsubst_friend_class (tree friend_tmpl, tree args) { tree parms = tsubst_template_parms (DECL_TEMPLATE_PARMS (friend_tmpl), args, tf_warning_or_error); + tsubst_each_template_parm_constraint (parms, args, + tf_warning_or_error); location_t saved_input_location = input_location; input_location = DECL_SOURCE_LOCATION (friend_tmpl); tree cons = get_constraints (tmpl); @@ -11534,6 +11542,8 @@ tsubst_friend_class (tree friend_tmpl, tree args) DECL_FRIEND_CONTEXT (friend_tmpl)); --processing_template_decl; set_constraints (tmpl, ci); + tsubst_each_template_parm_constraint (DECL_TEMPLATE_PARMS (tmpl), + args, tf_warning_or_error); } /* Inject this template into the enclosing namspace scope. */ @@ -13656,7 +13666,6 @@ tsubst_template_parm (tree t, tree args, tsubst_flags_t complain) default_value = TREE_PURPOSE (t); parm_decl = TREE_VALUE (t); - tree constraint = TEMPLATE_PARM_CONSTRAINTS (t); parm_decl = tsubst (parm_decl, args, complain, NULL_TREE); if (TREE_CODE (parm_decl) == PARM_DECL @@ -13664,13 +13673,31 @@ tsubst_template_parm (tree t, tree args, tsubst_flags_t complain) parm_decl = error_mark_node; default_value = tsubst_template_arg (default_value, args, complain, NULL_TREE); - constraint = tsubst_constraint (constraint, args, complain, NULL_TREE); tree r = build_tree_list (default_value, parm_decl); - TEMPLATE_PARM_CONSTRAINTS (r) = constraint; + TEMPLATE_PARM_CONSTRAINTS (r) = TEMPLATE_PARM_CONSTRAINTS (t); return r; } +/* Substitute in-place the TEMPLATE_PARM_CONSTRAINT of each template + parameter in PARMS for sake of declaration matching. */ + +static void +tsubst_each_template_parm_constraint (tree parms, tree args, + tsubst_flags_t complain) +{ + ++processing_template_decl; + for (; parms; parms = TREE_CHAIN (parms)) + { + tree level = TREE_VALUE (parms); + for (tree parm : tree_vec_range (level)) + TEMPLATE_PARM_CONSTRAINTS (parm) + = tsubst_constraint (TEMPLATE_PARM_CONSTRAINTS (parm), args, + complain, NULL_TREE); + } + --processing_template_decl; +} + /* Substitute the ARGS into the indicated aggregate (or enumeration) type T. If T is not an aggregate or enumeration type, it is handled as if by tsubst. IN_DECL is as for tsubst. If diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm11.C b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm11.C new file mode 100644 index 00000000000..f70de341a07 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-template-parm11.C @@ -0,0 +1,16 @@ +// PR c++/100374 +// { dg-do compile { target c++20 } } + +template +concept C = true; + +template +struct A { + template U> + void f(); + + template U> + struct B; +}; + +template struct A; -- 2.36.1.195.g8ddf593a25