diff options
| author | John McCall <rjmccall@apple.com> | 2012-03-08 22:00:17 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2012-03-08 22:00:17 +0000 |
| commit | 1e5bc4ffb2db5b575fb28d7ebffb6bb36b034162 (patch) | |
| tree | 58b8e7cec07dc02b749c671de873641312ddf9e3 /lib/Sema/SemaExpr.cpp | |
| parent | 49d517467c3dcd2c67e8a6c740ba5160e37625f7 (diff) | |
Don't crash when a statement in a block is ill-formed but
introduces cleanups anyway.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152345 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaExpr.cpp')
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index c1ce02eeea..b989fac838 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -8892,6 +8892,8 @@ ExprResult Sema::ActOnBlockStmtExpr(SourceLocation CaretLoc, Diag(CaretLoc, diag::err_blocks_disable); // Leave the expression-evaluation context. + if (hasAnyUnrecoverableErrorsInThisFunction()) + DiscardCleanupsInEvaluationContext(); assert(!ExprNeedsCleanups && "cleanups within block not correctly bound!"); PopExpressionEvaluationContext(); |