Add the BlockDecl to the DeclContext.

llvm-svn: 90808

2 files changed, 2 insertions, 1 deletions

diff --git a/clang/lib/Index/ASTVisitor.h b/clang/lib/Index/ASTVisitor.h
index 6cfa381608a..943c7202531 100644
--- a/clang/lib/Index/ASTVisitor.h
+++ b/clang/lib/Index/ASTVisitor.h
@@ -104,7 +104,7 @@ public:
   }
 
   void VisitBlockExpr(BlockExpr *Node) {
-    Visit(Node->getBlockDecl());
+    // The BlockDecl is also visited by 'VisitDeclContext()'.  No need to visit it twice.
   }
 
   void VisitStmt(Stmt *Node) {
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index b3c5c9fc20b..8332bf8f7b1 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -6499,6 +6499,7 @@ void Sema::ActOnBlockStart(SourceLocation CaretLoc, Scope *BlockScope) {
   CurFunctionNeedsScopeChecking = false;
 
   BSI->TheDecl = BlockDecl::Create(Context, CurContext, CaretLoc);
+  CurContext->addDecl(BSI->TheDecl);
   PushDeclContext(BlockScope, BSI->TheDecl);
 }