replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow equality comparisons between block pointers and 

block-pointer-compatible ObjC object pointer types.

Patch by Dustin Howett!

llvm-svn: 329508
This commit is contained in:
John McCall 2018-04-07 17:42:06 +00:00
parent ad136de644
commit 48f4d4f428
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10029,6 +10029,19 @@ QualType Sema::CheckCompareOperands(ExprResult &LHS, ExprResult &RHS,
RHS = ImpCastExprToType(RHS.get(), LHSType, CK_BitCast);
return ResultTy;
}
if (!IsRelational && LHSType->isBlockPointerType() &&
RHSType->isBlockCompatibleObjCPointerType(Context)) {
LHS = ImpCastExprToType(LHS.get(), RHSType,
CK_BlockPointerToObjCPointerCast);
return ResultTy;
} else if (!IsRelational &&
LHSType->isBlockCompatibleObjCPointerType(Context) &&
RHSType->isBlockPointerType()) {
RHS = ImpCastExprToType(RHS.get(), LHSType,
CK_BlockPointerToObjCPointerCast);
return ResultTy;
}
}
if ((LHSType->isAnyPointerType() && RHSType->isIntegerType()) ||
(LHSType->isIntegerType() && RHSType->isAnyPointerType())) {

51
clang/test/SemaObjC/block-compare.mm Normal file
View File

@ -0,0 +1,51 @@
// RUN: %clang_cc1 -S -o - -triple i686-windows -verify -fblocks \
// RUN: -Wno-unused-comparison %s
#pragma clang diagnostic ignored "-Wunused-comparison"
#define nil ((id)nullptr)
@protocol NSObject
@end
@protocol NSCopying
@end
@protocol OtherProtocol
@end
__attribute__((objc_root_class))
@interface NSObject <NSObject, NSCopying>
@end
__attribute__((objc_root_class))
@interface Test
@end
int main() {
void (^block)() = ^{};
NSObject *object;
id<NSObject, NSCopying> qualifiedId;
id<OtherProtocol> poorlyQualified1;
Test *objectOfWrongType;
block == nil;
block == object;
block == qualifiedId;
nil == block;
object == block;
qualifiedId == block;
// these are still not valid: blocks must be compared with id, NSObject*, or a protocol-qualified id
// conforming to NSCopying or NSObject.
block == poorlyQualified1; // expected-error {{invalid operands to binary expression ('void (^)()' and 'id<OtherProtocol>')}}
block == objectOfWrongType; // expected-error {{invalid operands to binary expression ('void (^)()' and 'Test *')}}
poorlyQualified1 == block; // expected-error {{invalid operands to binary expression ('id<OtherProtocol>' and 'void (^)()')}}
objectOfWrongType == block; // expected-error {{invalid operands to binary expression ('Test *' and 'void (^)()')}}
return 0;
}