diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 2 | ||||
| -rw-r--r-- | test/SemaObjC/arc-invalid.m | 13 |
2 files changed, 15 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(); diff --git a/test/SemaObjC/arc-invalid.m b/test/SemaObjC/arc-invalid.m new file mode 100644 index 0000000000..b07460dbec --- /dev/null +++ b/test/SemaObjC/arc-invalid.m @@ -0,0 +1,13 @@ +// RUN: %clang_cc1 -fsyntax-only -fobjc-arc -fblocks -verify %s + +// rdar://problem/10982793 +// [p foo] in ARC creates a cleanup. +// The plus is invalid and causes the cleanup to go unbound. +// Don't crash. +@interface A +- (id) foo; +@end +void takeBlock(void (^)(void)); +void test0(id p) { + takeBlock(^{ [p foo] + p; }); // expected-error {{invalid operands to binary expression}} +} |