averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

AnyObject is a BridgeableObjectType even if it's not @objc.

Browse Source 
Swift SVN r27412
This commit is contained in:
Joe Groff
2015-04-17 05:30:29 +00:00
parent bdbb5a9a5a
commit d46afe513e
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/AST/Type.cpp
View File

@@ -223,10 +223,14 @@ bool CanType::isObjCExistentialTypeImpl(CanType type) {
if (protocols.empty())
return false;
// Any non-@objc protocol makes this no longer ObjC-compatible.
// Any non-AnyObject, non-@objc protocol makes this no longer ObjC-compatible.
for (auto proto : protocols) {
if (!proto->isObjC())
return false;
if (proto->isSpecificProtocol(KnownProtocolKind::AnyObject))
continue;
if (proto->isObjC())
continue;
return false;
}
return true;
}

3
lib/Sema/CSSimplify.cpp
View File

@@ -1238,8 +1238,7 @@ static Type representsNonTrivialGenericParameter(TypeVariableType *typeVar) {
for (auto proto : archetype->getConformsTo()) {
// AnyObject is always trivially representable as a generic parameter;
// there is no runtime witness.
auto known = proto->getKnownProtocolKind();
if (known && *known == KnownProtocolKind::AnyObject)
if (proto->isSpecificProtocol(KnownProtocolKind::AnyObject))
continue;
// ObjC protocols are trivially representable as a generic parameter;