diff options
| -rw-r--r-- | lib/Parse/ParseExprCXX.cpp | 6 | ||||
| -rw-r--r-- | test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp | 11 |
2 files changed, 15 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()); diff --git a/test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp b/test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp index b976e1664e..b9f0414e91 100644 --- a/test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp +++ b/test/CXX/expr/expr.prim/expr.prim.general/p4-0x.cpp @@ -7,3 +7,14 @@ struct S { int arr[sizeof(this)]; // expected-error {{invalid use of 'this' outside of a nonstatic member function}} int sz = sizeof(this); // ok }; + +namespace CaptureThis { + struct X { + int n = 10; + int m = [&]{return n + 1; }(); + int o = [&]{return this->m + 1; }(); + int p = [&]{return [&](int x) { return this->m + x;}(o); }(); + }; + + X x; +} |