Per John's comment, it makes sense to ask isLambda on any CXXRecordDecl; make sure that's safe. Get rid of a check which is now unnecessary in Sema::getFunctionLevelDeclContext().

llvm-svn: 147837

2 files changed, 1 insertions, 2 deletions

diff --git a/clang/include/clang/AST/DeclCXX.h b/clang/include/clang/AST/DeclCXX.h
index 17c82ca3ef2..983139b7b45 100644
--- a/clang/include/clang/AST/DeclCXX.h
+++ b/clang/include/clang/AST/DeclCXX.h
@@ -913,7 +913,7 @@ public:
   bool hasDeclaredDestructor() const { return data().DeclaredDestructor; }
 
   /// \brief Determine whether this class describes a lambda function object.
-  bool isLambda() const { return data().IsLambda; }
+  bool isLambda() const { return hasDefinition() && data().IsLambda; }
   
   void setLambda(bool Lambda = true) { data().IsLambda = Lambda; }
 
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index 72073a10386..8d358950f68 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -640,7 +640,6 @@ DeclContext *Sema::getFunctionLevelDeclContext() {
     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();
     }