diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 1 | ||||
| -rw-r--r-- | test/CXX/expr/expr.prim/expr.prim.lambda/p14.cpp | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 11468e8676..4db266b2ed 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -9576,6 +9576,7 @@ static ExprResult captureInLambda(Sema &S, LambdaScopeInfo *LSI, 0, false, false); Field->setImplicit(true); Field->setAccess(AS_private); + Lambda->addDecl(Field); // C++11 [expr.prim.lambda]p21: // When the lambda-expression is evaluated, the entities that diff --git a/test/CXX/expr/expr.prim/expr.prim.lambda/p14.cpp b/test/CXX/expr/expr.prim/expr.prim.lambda/p14.cpp index 4c876d7480..10d1e927bf 100644 --- a/test/CXX/expr/expr.prim/expr.prim.lambda/p14.cpp +++ b/test/CXX/expr/expr.prim/expr.prim.lambda/p14.cpp @@ -29,3 +29,20 @@ void capture_with_default_args(CopyCtorDefault cct) { } // FIXME: arrays! + +// Check for the expected non-static data members. + +struct ExpectedLayout { + char a; + short b; +}; + +template<typename T> void capture(const T&); + +void test_layout(char a, short b) { + auto x = [=] () -> void { // expected-error{{lambda expressions are not supported yet}} + capture(a); + capture(b); + }; + static_assert(sizeof(x) == sizeof(ExpectedLayout), "Layout mismatch!"); +} |