diff options
| -rw-r--r-- | lib/Parse/ParseExpr.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp index 47e364e361..ec36fedc2d 100644 --- a/lib/Parse/ParseExpr.cpp +++ b/lib/Parse/ParseExpr.cpp @@ -1342,6 +1342,7 @@ Parser::OwningExprResult Parser::ParseBlockLiteralExpression() { // If there was an error parsing the arguments, they may have // tried to use ^(x+y) which requires an argument list. Just // skip the whole block literal. + Actions.ActOnBlockError(CaretLoc, CurScope); return ExprError(); } // Inform sema that we are starting a block. @@ -1364,6 +1365,7 @@ Parser::OwningExprResult Parser::ParseBlockLiteralExpression() { if (!Tok.is(tok::l_brace)) { // Saw something like: ^expr Diag(Tok, diag::err_expected_expression); + Actions.ActOnBlockError(CaretLoc, CurScope); return ExprError(); } diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 4df6feec9f..b580b01bc4 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -3155,7 +3155,7 @@ Sema::DeclPtrTy Sema::ActOnFinishFunctionBody(DeclPtrTy D, StmtArg BodyArg) { 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. |