diff options
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 7 | ||||
| -rw-r--r-- | test/SemaObjCXX/cstyle-block-pointer-cast.mm | 19 |
2 files changed, 26 insertions, 0 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index e9b6072adc..7b0c98c569 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -1151,6 +1151,13 @@ bool Sema::isObjCPointerConversion(QualType FromType, QualType ToType, } ToPointeeType = ToBlockPtr->getPointeeType(); } + else if (FromType->getAs<BlockPointerType>() && + ToObjCPtr && ToObjCPtr->isObjCBuiltinType()) { + // Objective C++: We're able to convert from a block pointer type to a + // pointer to an any object. + ConvertedType = ToType; + return true; + } else return false; diff --git a/test/SemaObjCXX/cstyle-block-pointer-cast.mm b/test/SemaObjCXX/cstyle-block-pointer-cast.mm index 2796512ac0..72f5283dea 100644 --- a/test/SemaObjCXX/cstyle-block-pointer-cast.mm +++ b/test/SemaObjCXX/cstyle-block-pointer-cast.mm @@ -21,3 +21,22 @@ typedef int (^blocktype)(int a, int b); return (blocktype)c; } @end + +@interface B { + blocktype a; + blocktype b; + blocktype c; +} +- (id)Meth; +@end + +@implementation B +- (id)Meth { + if (a) + return (A*)a; // expected-error {{C-style cast from 'blocktype' (aka 'int (^)(int, int)') to 'A *' is not allowed}} + if (b) + return (id)b; + if (c) + return (Class)b; +} +@end |