commit eb4d4a525d9ebc3c40249b57aa74d1ac83d8ccf1
author Chris Lattner <sabre@nondot.org> Tue Apr 21 22:38:46 2009 +0000
committer Chris Lattner <sabre@nondot.org> Tue Apr 21 22:38:46 2009 +0000
tree dd6528e07a22559172ba6aef93c07d16f05a6219
parent 654116320512fe268b7d516b681dcb977b4d871e

Fix rdar://6814047, a crash on invalid in blocks code I noticed when
working on the previous fix.


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

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 57902cc..fa85757 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -4755,8 +4755,8 @@
   CurFunctionNeedsScopeChecking = CurBlock->SavedFunctionNeedsScopeChecking;
 
   // Pop off CurBlock, handle nested blocks.
+  PopDeclContext();
   CurBlock = CurBlock->PrevBlockInfo;
-
   // FIXME: Delete the ParmVarDecl objects as well???
 }