diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2015-10-02 01:05:29 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2015-10-02 01:05:29 +0000 |
| commit | 7e9fd56b267c5bf001888dc010b729d7553bcaa4 (patch) | |
| tree | 32adcd14acdb17d34c71f8bdc257d56d3a124795 /clang/lib/Sema/SemaExprObjC.cpp | |
| parent | fdbbd25d0d2b77b434155b27e3665c831633ead9 (diff) | |
| download | bcm5719-llvm-7e9fd56b267c5bf001888dc010b729d7553bcaa4.tar.gz bcm5719-llvm-7e9fd56b267c5bf001888dc010b729d7553bcaa4.zip | |
Be slightly more permissive when checking for type-erased blocks.
This is a patch from Doug that was inadvertently omitted from r241543.
llvm-svn: 249116
Diffstat (limited to 'clang/lib/Sema/SemaExprObjC.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaExprObjC.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprObjC.cpp b/clang/lib/Sema/SemaExprObjC.cpp index 88337b8ff3b..b663566ff70 100644 --- a/clang/lib/Sema/SemaExprObjC.cpp +++ b/clang/lib/Sema/SemaExprObjC.cpp @@ -1657,7 +1657,8 @@ bool Sema::CheckMessageArgumentTypes(QualType ReceiverType, // Objective-C pointer type, we may need to extend the lifetime // of the block object. if (typeArgs && Args[i]->isRValue() && paramType->isBlockPointerType() && - origParamType->isBlockCompatibleObjCPointerType(Context)) { + Args[i]->getType()->isBlockPointerType() && + origParamType->isObjCObjectPointerType()) { ExprResult arg = Args[i]; maybeExtendBlockObject(arg); Args[i] = arg.get(); |
