[PATCH] c++: use current_template_constraints more

[PATCH] c++: use current_template_constraints more

[Patrick Palka]

gcc/cp/ChangeLog:

	* decl.cc (grokvardecl): Use current_template_constraints.
	(xref_tag): Likewise.
	* semantics.cc (finish_template_template_parm): Likewise.
---
 gcc/cp/decl.cc      | 13 +++----------
 gcc/cp/semantics.cc |  3 +--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 892e4a4b19b..26428ca7122 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -10789,9 +10789,7 @@ grokvardecl (tree type,
   else if (flag_concepts
 	   && current_template_depth > template_class_depth (scope))
     {
-      tree reqs = TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
-      tree ci = build_constraints (reqs, NULL_TREE);
-
+      tree ci = current_template_constraints ();
       set_constraints (decl, ci);
     }
 
@@ -15852,13 +15850,8 @@ xref_tag (enum tag_types tag_code, tree name,
         {
           /* Check that we aren't trying to overload a class with different
              constraints.  */
-          tree constr = NULL_TREE;
-          if (current_template_parms)
-            {
-              tree reqs = TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
-              constr = build_constraints (reqs, NULL_TREE);
-            }
-	  if (!redeclare_class_template (t, current_template_parms, constr))
+	  if (!redeclare_class_template (t, current_template_parms,
+					 current_template_constraints ()))
 	    return error_mark_node;
         }
       else if (!processing_template_decl
diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index cd7a2818feb..efdeb9318a7 100644
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -3387,8 +3387,7 @@ finish_template_template_parm (tree aggr, tree identifier)
 
   /* Associate the constraints with the underlying declaration,
      not the template.  */
-  tree reqs = TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
-  tree constr = build_constraints (reqs, NULL_TREE);
+  tree constr = current_template_constraints ();
   set_constraints (decl, constr);
 
   end_template_decl ();
-- 
2.36.1.195.g8ddf593a25

Re: [PATCH] c++: use current_template_constraints more

[Jason Merrill]

On 5/27/22 14:05, Patrick Palka wrote:
> gcc/cp/ChangeLog:
> 
> 	* decl.cc (grokvardecl): Use current_template_constraints.
> 	(xref_tag): Likewise.
> 	* semantics.cc (finish_template_template_parm): Likewise.

OK.

> ---
>   gcc/cp/decl.cc      | 13 +++----------
>   gcc/cp/semantics.cc |  3 +--
>   2 files changed, 4 insertions(+), 12 deletions(-)
> 
> diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
> index 892e4a4b19b..26428ca7122 100644
> --- a/gcc/cp/decl.cc
> +++ b/gcc/cp/decl.cc
> @@ -10789,9 +10789,7 @@ grokvardecl (tree type,
>     else if (flag_concepts
>   	   && current_template_depth > template_class_depth (scope))
>       {
> -      tree reqs = TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
> -      tree ci = build_constraints (reqs, NULL_TREE);
> -
> +      tree ci = current_template_constraints ();
>         set_constraints (decl, ci);
>       }
>   
> @@ -15852,13 +15850,8 @@ xref_tag (enum tag_types tag_code, tree name,
>           {
>             /* Check that we aren't trying to overload a class with different
>                constraints.  */
> -          tree constr = NULL_TREE;
> -          if (current_template_parms)
> -            {
> -              tree reqs = TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
> -              constr = build_constraints (reqs, NULL_TREE);
> -            }
> -	  if (!redeclare_class_template (t, current_template_parms, constr))
> +	  if (!redeclare_class_template (t, current_template_parms,
> +					 current_template_constraints ()))
>   	    return error_mark_node;
>           }
>         else if (!processing_template_decl
> diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
> index cd7a2818feb..efdeb9318a7 100644
> --- a/gcc/cp/semantics.cc
> +++ b/gcc/cp/semantics.cc
> @@ -3387,8 +3387,7 @@ finish_template_template_parm (tree aggr, tree identifier)
>   
>     /* Associate the constraints with the underlying declaration,
>        not the template.  */
> -  tree reqs = TEMPLATE_PARMS_CONSTRAINTS (current_template_parms);
> -  tree constr = build_constraints (reqs, NULL_TREE);
> +  tree constr = current_template_constraints ();
>     set_constraints (decl, constr);
>   
>     end_template_decl ();