diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-02-21 22:51:27 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-02-21 22:51:27 +0000 |
| commit | fccfb625e3090e77da9b6a79edcab159c7006685 (patch) | |
| tree | 435ca57ec519902a1312f5c8d8ff0fad45c2e4ae /lib/Parse/ParseExprCXX.cpp | |
| parent | 51e47df5a57430f1b691b04258e663cce68aef9d (diff) | |
In the conflict between C++11 [expr.prim.general]p4, which declares
that 'this' can be used in the brace-or-equal-initializer of a
non-static data member, and C++11 [expr.prim.lambda]p9, which says
that lambda expressions not in block scope can have no captures, side
fully with C++11 [expr.prim.general]p4 by allowing 'this' to be
captured within these initializers. This seems to be the intent of
non-static data member initializers.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151101 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseExprCXX.cpp')
| -rw-r--r-- | lib/Parse/ParseExprCXX.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp index fecf7b7765..af532de385 100644 --- a/lib/Parse/ParseExprCXX.cpp +++ b/lib/Parse/ParseExprCXX.cpp @@ -870,8 +870,10 @@ ExprResult Parser::ParseLambdaExpressionAfterIntroducer( // FIXME: Rename BlockScope -> ClosureScope if we decide to continue using // it. - ParseScope BodyScope(this, Scope::BlockScope | Scope::FnScope | - Scope::DeclScope); + unsigned ScopeFlags = Scope::BlockScope | Scope::FnScope | Scope::DeclScope; + if (getCurScope()->getFlags() & Scope::ThisScope) + ScopeFlags |= Scope::ThisScope; + ParseScope BodyScope(this, ScopeFlags); Actions.ActOnStartOfLambdaDefinition(Intro, D, getCurScope()); |