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

Objective-C. Diagnose assigning a block pointer type to 

an Objective-C object type other than 'id'. 
// rdar://16739120

llvm-svn: 209906
This commit is contained in:
Fariborz Jahanian 2014-05-30 16:35:53 +00:00
parent 0ae08a849d
commit b3a7068700
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Sema/SemaExpr.cpp
View File

@ -6435,8 +6435,8 @@ Sema::CheckAssignmentConstraints(QualType LHSType, ExprResult &RHS,
return IncompatiblePointer;
}
// T^ -> A*
if (RHSType->isBlockPointerType()) {
// T^ -> id; not T^ ->A* and not T^ -> id<P>
if (RHSType->isBlockPointerType() && LHSType->isObjCIdType()) {
maybeExtendBlockObject(*this, RHS);
Kind = CK_BlockPointerToObjCPointerCast;
return Compatible;

22
clang/test/SemaObjC/block-type-safety.m
View File

@ -155,3 +155,25 @@ void f() {
return NSOrderedSame;
}];
}
// rdar://16739120
@protocol P1 @end
@protocol P2 @end
void Test() {
void (^aBlock)();
id anId = aBlock; // OK
id<P1,P2> anQualId = aBlock; // expected-error {{initializing 'id<P1,P2>' with an expression of incompatible type 'void (^)()'}}
NSArray* anArray = aBlock; // expected-error {{initializing 'NSArray *' with an expression of incompatible type 'void (^)()'}}
aBlock = anId; // OK
id<P1,P2> anQualId1;
aBlock = anQualId1; // expected-error {{assigning to 'void (^)()' from incompatible type 'id<P1,P2>'}}
NSArray* anArray1;
aBlock = anArray1; // expected-error {{assigning to 'void (^)()' from incompatible type 'NSArray *'}}
}