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

Merge pull request #26302 from xedin/remove-label-mismatch-from-lookup

Browse Source 
[Diagnostics] Don't filter overload set candidates based on labels in lookup
This commit is contained in:
Pavel Yaskevich
2019-07-26 10:34:23 -07:00
committed by GitHub
parent 3f6e367a0f 1b4f9c33eb
commit effd0d00c6
21 changed files with 209 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Sema/ConstraintSystem.cpp
View File

@@ -1493,10 +1493,18 @@ Type ConstraintSystem::getEffectiveOverloadType(const OverloadChoice &overload,
return Type();
if (!overload.getBaseType()->getOptionalObjectType()) {
Type selfType = overload.getBaseType()->getRValueType()
->getMetatypeInstanceType()
->lookThroughAllOptionalTypes();
type = type->replaceCovariantResultType(selfType, 2);
Type selfType = overload.getBaseType()
->getRValueType()
->getMetatypeInstanceType();
// `Int??(0)` if we look through all optional types for `Self`
// we'll end up with incorrect type `Int?` for result because
// the actual result type is `Int??`.
if (isa<ConstructorDecl>(decl) && selfType->getOptionalObjectType())
return Type();
type = type->replaceCovariantResultType(
selfType->lookThroughAllOptionalTypes(), 2);
}
}
}