When we create a non-static data member in the closure object for a

capture, make sure we actually add the field.

llvm-svn: 150135

2 files changed, 18 insertions, 0 deletions

diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 11468e86769..4db266b2edf 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/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/clang/test/CXX/expr/expr.prim/expr.prim.lambda/p14.cpp b/clang/test/CXX/expr/expr.prim/expr.prim.lambda/p14.cpp
index 4c876d7480d..10d1e927bfe 100644
--- a/clang/test/CXX/expr/expr.prim/expr.prim.lambda/p14.cpp
+++ b/clang/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!");
+}