diff options
| author | Jason Merrill <jason@redhat.com> | 2011-06-17 16:07:45 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-06-17 16:07:45 -0400 |
| commit | 806010b9faf8e87d4bbdb01f0912801796f30708 (patch) | |
| tree | 1842e01a48cfd2193e626c4094b0bab4493d7987 /gcc/cp/pt.c | |
| parent | 2cd8d506c4c4ffac3b47e2fe55c94de35e8de0f7 (diff) | |
| download | gcc-806010b9faf8e87d4bbdb01f0912801796f30708.zip gcc-806010b9faf8e87d4bbdb01f0912801796f30708.tar.gz gcc-806010b9faf8e87d4bbdb01f0912801796f30708.tar.bz2 | |
parser.c (cp_parser_lambda_expression): Clear LAMBDA_EXPR_THIS_CAPTURE after parsing.
* parser.c (cp_parser_lambda_expression): Clear
LAMBDA_EXPR_THIS_CAPTURE after parsing.
* pt.c (tsubst_copy_and_build): Make sure it isn't set.
From-SVN: r175156
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 308aff7..ca4f955 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13498,10 +13498,9 @@ tsubst_copy_and_build (tree t, = (LAMBDA_EXPR_DISCRIMINATOR (t)); LAMBDA_EXPR_CAPTURE_LIST (r) = RECUR (LAMBDA_EXPR_CAPTURE_LIST (t)); - LAMBDA_EXPR_THIS_CAPTURE (r) - = RECUR (LAMBDA_EXPR_THIS_CAPTURE (t)); LAMBDA_EXPR_EXTRA_SCOPE (r) = RECUR (LAMBDA_EXPR_EXTRA_SCOPE (t)); + gcc_assert (LAMBDA_EXPR_THIS_CAPTURE (t) == NULL_TREE); /* Do this again now that LAMBDA_EXPR_EXTRA_SCOPE is set. */ determine_visibility (TYPE_NAME (type)); |