diff options
| author | Patrick Palka <ppalka@redhat.com> | 2021-04-09 17:03:04 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2021-04-09 17:03:04 -0400 |
| commit | b2576d75ed8900f77849ceacf7fe5f0f3abe734d (patch) | |
| tree | b97d64dc9a547017ba5241a32e0b411176675ae1 /gcc/cp/constraint.cc | |
| parent | cc796820466acb02989c72d42d96f06b4e5e020a (diff) | |
| download | gcc-b2576d75ed8900f77849ceacf7fe5f0f3abe734d.zip gcc-b2576d75ed8900f77849ceacf7fe5f0f3abe734d.tar.gz gcc-b2576d75ed8900f77849ceacf7fe5f0f3abe734d.tar.bz2 | |
c++: Use a TEMPLATE_INFO to hold regenerated-lambda info
A TEMPLATE_INFO is a natural fit for what LAMBDA_EXPR_REGENERATED_FROM
and LAMBDA_EXPR_REGENERATING_TARGS hold, so let's use it instead.
gcc/cp/ChangeLog:
* cp-tree.h (LAMBDA_EXPR_REGENERATED_FROM)
(LAMBDA_EXPR_REGENERATING_TARGS): Replace these with ...
(LAMBDA_EXPR_REGEN_INFO): ... this.
(tree_lambda_expr::regenerated_from)
(tree_lambda_expr::regenerating_targs): Replace these with ...
(tree_lambda_expr::regen_info): ... this.
* constraint.cc (satisfy_declaration_constraints): Adjust
accordingly.
* lambda.c (build_lambda_expr): Likewise.
* pt.c (regenerated_lambda_fn_p): Likewise.
(most_general_lambda): Likewise.
(tsubst_lambda_expr): Likewise.
Diffstat (limited to 'gcc/cp/constraint.cc')
| -rw-r--r-- | gcc/cp/constraint.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc index 0a9d1bf..0ddb299 100644 --- a/gcc/cp/constraint.cc +++ b/gcc/cp/constraint.cc @@ -3193,7 +3193,7 @@ satisfy_declaration_constraints (tree t, sat_info info) arguments that were used to regenerate the lambda. */ gcc_assert (!args || TMPL_ARGS_DEPTH (args) == 1); tree lambda = CLASSTYPE_LAMBDA_EXPR (DECL_CONTEXT (t)); - tree outer_args = LAMBDA_EXPR_REGENERATING_TARGS (lambda); + tree outer_args = TI_ARGS (LAMBDA_EXPR_REGEN_INFO (lambda)); if (args) args = add_to_template_args (outer_args, args); else @@ -3256,7 +3256,7 @@ satisfy_declaration_constraints (tree t, tree args, sat_info info) /* As in the two-parameter version of this function. */ gcc_assert (TMPL_ARGS_DEPTH (args) == 1); tree lambda = CLASSTYPE_LAMBDA_EXPR (DECL_CONTEXT (t)); - tree outer_args = LAMBDA_EXPR_REGENERATING_TARGS (lambda); + tree outer_args = TI_ARGS (LAMBDA_EXPR_REGEN_INFO (lambda)); args = add_to_template_args (outer_args, args); } else |