diff options
| -rw-r--r-- | clang/lib/Sema/SemaExprObjC.cpp | 3 | ||||
| -rw-r--r-- | clang/test/CodeGenObjC/parameterized_classes.m | 7 |
2 files changed, 9 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(); diff --git a/clang/test/CodeGenObjC/parameterized_classes.m b/clang/test/CodeGenObjC/parameterized_classes.m index 1d8e9a25993..b75cf2e3ad2 100644 --- a/clang/test/CodeGenObjC/parameterized_classes.m +++ b/clang/test/CodeGenObjC/parameterized_classes.m @@ -24,6 +24,8 @@ __attribute__((objc_root_class)) - (void)addObject:(T)object; - (void)sortWithFunction:(int (*)(T, T))function; - (void)getObjects:(T __strong *)objects length:(unsigned*)length; +- (T)objectAtIndexedSubscript:(unsigned)index; +- (void)setObject:(T)object atIndexedSubscript:(unsigned)index; @end NSString *getFirstObjectProp(NSMutableArray<NSString *> *array) { @@ -58,6 +60,11 @@ void printMe(NSString *name) { } // CHECK-LABEL: define void @blockTest void blockTest(NSMutableArray<void (^)(void)> *array, NSString *name) { + // CHECK-NOT: ret void // CHECK: call i8* @objc_retainBlock [array addObject: ^ { printMe(name); }]; + // CHECK-NOT: ret void + array[0] = ^ { printMe(name); }; + // CHECK: call i8* @objc_retainBlock + // CHECK: ret void } |
