commit 4f2aac33fe0e181c1c96bc9b502343935a794b5e
author Chris Lattner <sabre@nondot.org> Sat Apr 18 20:05:34 2009 +0000
committer Chris Lattner <sabre@nondot.org> Sat Apr 18 20:05:34 2009 +0000
tree 57f9feb5829def4392af849ce71d39615b0cdae2
parent ea29a3a0d6948c4a51a261d19ec1a585d2a9c779

fix two error paths out of ParseBlockLiteralExpression to
call ActOnBlockError so that CurBlock gets popped.  This
fixes a crash on test/block-syntax-error.c when this new
assertion is enabled.


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

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 4df6fee..b580b01 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -3155,7 +3155,7 @@
   PopDeclContext();
   // Verify and clean out per-function state.
 
-  //assert(&getLabelMap() == &FunctionLabelMap && "Didn't pop block right?");
+  assert(&getLabelMap() == &FunctionLabelMap && "Didn't pop block right?");
   
   bool HaveLabels = !FunctionLabelMap.empty();
   // Check goto/label use.