commit 72899c34e3d1abfffa241ad0ce5c4bf175e5ea51
author Eli Friedman <eli.friedman@gmail.com> Sat Jan 07 04:59:52 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Sat Jan 07 04:59:52 2012 +0000
tree 2a9209442a417053e832e18b7a3416e787789642
parent 9f03b62036a7abc0a227b17f4a49b9eefced9450

More lambda work: semantic analysis of capturing 'this'.  It's a bit complicated, but we have to be careful about when exactly captures are marked given PotentiallyPotentiallyEvaluated contexts.  (Actually, it's not 100% correct yet, but it's close enough for the moment.)



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

lib/Sema/Sema.cpp

diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index 4ab960d..72073a1 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -636,8 +636,16 @@
 DeclContext *Sema::getFunctionLevelDeclContext() {
   DeclContext *DC = CurContext;
 
-  while (isa<BlockDecl>(DC) || isa<EnumDecl>(DC))
-    DC = DC->getParent();
+  while (true) {
+    if (isa<BlockDecl>(DC) || isa<EnumDecl>(DC)) {
+      DC = DC->getParent();
+    } else if (isa<CXXMethodDecl>(DC) &&
+               cast<CXXRecordDecl>(DC->getParent())->hasDefinition() &&
+               cast<CXXRecordDecl>(DC->getParent())->isLambda()) {
+      DC = DC->getParent()->getParent();
+    }
+    else break;
+  }
 
   return DC;
 }