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

Eliminate more "DynamicLookup" in favor of "AnyObject", this is the

Browse Source 
bulk of finishing rdar://13327098.


Swift SVN r14653
This commit is contained in:
Chris Lattner
2014-03-04 22:15:46 +00:00
parent b0b08887e1
commit d758e0dfe3
38 changed files with 193 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/CSSimplify.cpp
View File

@@ -1512,7 +1512,7 @@ ConstraintSystem::simplifyMemberConstraint(const Constraint &constraint) {
bool isDynamicLookup = false;
if (auto protoTy = instanceTy->getAs<ProtocolType>()) {
isDynamicLookup = protoTy->getDecl()->isSpecificProtocol(
KnownProtocolKind::DynamicLookup);
KnownProtocolKind::AnyObject);
}
// Introduce a new overload set to capture the choices.
@@ -1544,7 +1544,7 @@ ConstraintSystem::simplifyMemberConstraint(const Constraint &constraint) {
!result->isInstanceMember())
continue;
// If we're doing dynamic lookup into a metatype of DynamicLookup and we've
// If we're doing dynamic lookup into a metatype of AnyObject and we've
// found an instance member, ignore it.
if (isDynamicLookup && isMetatype && result->isInstanceMember()) {
// FIXME: Mark as 'unavailable' somehow.
@@ -1664,7 +1664,7 @@ ConstraintSystem::simplifyDynamicLookupConstraint(const Constraint &constraint){
if (auto protoTy = baseTy->getAs<ProtocolType>()) {
if (protoTy->getDecl()->isSpecificProtocol(
KnownProtocolKind::DynamicLookup))
KnownProtocolKind::AnyObject))
return SolutionKind::Solved;
}