diff options
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 33 | ||||
| -rw-r--r-- | clang/test/SemaObjC/blocks.m | 3 |
2 files changed, 25 insertions, 11 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index dda8654b49b..f2820df93e8 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -4655,11 +4655,18 @@ void Sema::ActOnBlockArguments(Declarator &ParamInfo, Scope *CurScope) { CurBlock->hasPrototype = true; CurBlock->isVariadic = false; - Type *RetTy = T.getTypePtr()->getAsFunctionType()->getResultType() - .getTypePtr(); + + QualType RetTy = T.getTypePtr()->getAsFunctionType()->getResultType(); + + // Do not allow returning a objc interface by-value. + if (RetTy->isObjCInterfaceType()) { + Diag(ParamInfo.getSourceRange().getBegin(), + diag::err_object_cannot_be_passed_returned_by_value) << 0 << RetTy; + return; + } if (!RetTy->isDependentType()) - CurBlock->ReturnType = RetTy; + CurBlock->ReturnType = RetTy.getTypePtr(); return; } @@ -4683,22 +4690,26 @@ void Sema::ActOnBlockArguments(Declarator &ParamInfo, Scope *CurScope) { for (unsigned i = 0, e = FTI.NumArgs; i != e; ++i) CurBlock->Params.push_back(FTI.ArgInfo[i].Param.getAs<ParmVarDecl>()); CurBlock->isVariadic = FTI.isVariadic; - QualType T = GetTypeForDeclarator (ParamInfo, CurScope); - - Type* RetTy = T.getTypePtr()->getAsFunctionType()->getResultType() - .getTypePtr(); - - if (!RetTy->isDependentType()) - CurBlock->ReturnType = RetTy; } CurBlock->TheDecl->setParams(Context, &CurBlock->Params[0], - CurBlock->Params.size()); + CurBlock->Params.size()); for (BlockDecl::param_iterator AI = CurBlock->TheDecl->param_begin(), E = CurBlock->TheDecl->param_end(); AI != E; ++AI) // If this has an identifier, add it to the scope stack. if ((*AI)->getIdentifier()) PushOnScopeChains(*AI, CurBlock->TheScope); + + // Analyze the return type. + QualType T = GetTypeForDeclarator(ParamInfo, CurScope); + QualType RetTy = T->getAsFunctionType()->getResultType(); + + // Do not allow returning a objc interface by-value. + if (RetTy->isObjCInterfaceType()) { + Diag(ParamInfo.getSourceRange().getBegin(), + diag::err_object_cannot_be_passed_returned_by_value) << 0 << RetTy; + } else if (!RetTy->isDependentType()) + CurBlock->ReturnType = RetTy.getTypePtr(); } /// ActOnBlockError - If there is an error parsing a block, this callback diff --git a/clang/test/SemaObjC/blocks.m b/clang/test/SemaObjC/blocks.m index b27d65d833c..544eddd507d 100644 --- a/clang/test/SemaObjC/blocks.m +++ b/clang/test/SemaObjC/blocks.m @@ -40,4 +40,7 @@ void foo7(id (^x)(int)) { void foo8() { void *P = ^(itf x) {}; // expected-error {{Objective-C interface type 'itf' cannot be passed by value}} + P = ^itf(int x) {}; // expected-error {{Objective-C interface type 'itf' cannot be returned by value}} + P = ^itf() {}; // expected-error {{Objective-C interface type 'itf' cannot be returned by value}} + P = ^itf{}; // expected-error {{Objective-C interface type 'itf' cannot be returned by value}} } |
