Refactor lambda IRGen so AggExprEmitter::VisitLambdaExpr does the right thing.
llvm-svn: 150146
diff --git a/clang/lib/CodeGen/CGExprCXX.cpp b/clang/lib/CodeGen/CGExprCXX.cpp
index aa3b3a8..b049e02 100644
--- a/clang/lib/CodeGen/CGExprCXX.cpp
+++ b/clang/lib/CodeGen/CGExprCXX.cpp
@@ -1764,3 +1764,50 @@
return Value;
}
+
+namespace {
+ struct CallLambdaMemberDtor : EHScopeStack::Cleanup {
+ FieldDecl *Field;
+ CXXDestructorDecl *Dtor;
+ llvm::Value *Lambda;
+
+ CallLambdaMemberDtor(FieldDecl *Field, CXXDestructorDecl *Dtor,
+ llvm::Value *Lambda)
+ : Field(Field), Dtor(Dtor), Lambda(Lambda) {}
+
+ void Emit(CodeGenFunction &CGF, Flags flags) {
+ LValue LHS = CGF.EmitLValueForField(Lambda, Field, 0);
+ CGF.EmitCXXDestructorCall(Dtor, Dtor_Complete, /*ForVirtualBase=*/false,
+ LHS.getAddress());
+ }
+ };
+}
+
+void CodeGenFunction::EmitLambdaExpr(const LambdaExpr *E, AggValueSlot Slot) {
+ EHScopeStack::stable_iterator CleanupDepth = EHStack.stable_begin();
+ CXXRecordDecl::field_iterator CurField = E->getLambdaClass()->field_begin();
+ for (LambdaExpr::capture_init_iterator i = E->capture_init_begin(),
+ e = E->capture_init_end();
+ i != e; ++i, ++CurField) {
+ // FIXME: Add array handling
+ // FIXME: Try to refactor with CodeGenFunction::EmitCtorPrologue
+
+ // Emit initialization
+ LValue LV = EmitLValueForFieldInitialization(Slot.getAddr(), *CurField, 0);
+ EmitExprAsInit(*i, *CurField, LV, false);
+
+ // Add temporary cleanup to handle the case where a later initialization
+ // throws.
+ if (!CGM.getLangOptions().Exceptions)
+ continue;
+ const RecordType *RT = CurField->getType()->getAs<RecordType>();
+ if (!RT)
+ continue;
+ CXXRecordDecl *RD = cast<CXXRecordDecl>(RT->getDecl());
+ if (!RD->hasTrivialDestructor())
+ EHStack.pushCleanup<CallLambdaMemberDtor>(EHCleanup, *CurField,
+ RD->getDestructor(),
+ Slot.getAddr());
+ }
+ PopCleanupBlocks(CleanupDepth);
+}