commit cec5ebd4a6a89a7023d04cec728fd340b541ed61
author Eli Friedman <eli.friedman@gmail.com> Sat Feb 11 02:57:39 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Sat Feb 11 02:57:39 2012 +0000
tree ba89ba17ed6bc4f88a8cbb9e393a0d9979e5f58a
parent 668165ab1e604b063c0aa0df8ff91c80879670bf

Basic support for referring to captured variables from lambdas.  Some simple examples seem to work.  Tests coming up soon.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@150293 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGExpr.cpp

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 85b0138..ae4084b 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -1396,6 +1396,12 @@
     llvm::Value *V = LocalDeclMap[VD];
     if (!V && VD->isStaticLocal()) 
       V = CGM.getStaticLocalDeclAddress(VD);
+
+    // Use special handling for lambdas.
+    if (!V)
+      if (FieldDecl *FD = LambdaCaptureFields.lookup(VD))
+        return EmitLValueForField(CXXABIThisValue, FD, 0);
+
     assert(V && "DeclRefExpr not entered in LocalDeclMap?");
 
     if (VD->hasAttr<BlocksAttr>())