maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

In TreeTransform<Derived>::TransformBlockExpr, call ActOnBlockError for errors, 

patch by Dmitri Gribenko.

llvm-svn: 148915
This commit is contained in:
Argyrios Kyrtzidis 2012-01-25 03:53:04 +00:00
parent 3ad5bc019a
commit 34172b83d6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/Sema/TreeTransform.h
View File

@ -8125,8 +8125,10 @@ TreeTransform<Derived>::TransformBlockExpr(BlockExpr *E) {
if (getDerived().TransformFunctionTypeParams(E->getCaretLocation(),
oldBlock->param_begin(),
oldBlock->param_size(),
0, paramTypes, &params))
0, paramTypes, &params)) {
getSema().ActOnBlockError(E->getCaretLocation(), /*Scope=*/0);
return ExprError();
}
const FunctionType *exprFunctionType = E->getFunctionType();
QualType exprResultType = exprFunctionType->getResultType();
@ -8147,6 +8149,7 @@ TreeTransform<Derived>::TransformBlockExpr(BlockExpr *E) {
getSema().Diag(E->getCaretLocation(),
diag::err_object_cannot_be_passed_returned_by_value)
<< 0 << blockScope->ReturnType;
getSema().ActOnBlockError(E->getCaretLocation(), /*Scope=*/0);
return ExprError();
}
@ -8171,8 +8174,10 @@ TreeTransform<Derived>::TransformBlockExpr(BlockExpr *E) {
// Transform the body
StmtResult body = getDerived().TransformStmt(E->getBody());
if (body.isInvalid())
if (body.isInvalid()) {
getSema().ActOnBlockError(E->getCaretLocation(), /*Scope=*/0);
return ExprError();
}
#ifndef NDEBUG
// In builds with assertions, make sure that we captured everything we