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

More progress towards getting same-type constraints working correctly.

Browse Source 
Swift SVN r16023
This commit is contained in:
Joe Pamer
2014-04-07 21:31:52 +00:00
parent b9fdfe3063
commit 18f3bf67b0
7 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Sema/ConstraintSystem.cpp
View File

@@ -1189,10 +1189,17 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
// in the case of a conformance check against an associated type rooted off of
// "Self"), we'll need to open the type up so as not to short-circuit the
// binding constraint against the already bound overload type.
if ((choice.getKind() == OverloadChoiceKind::TypeDecl) &&
refType->getAs<DependentMemberType>()) {
if (refType->isDependentType()) {
openedFullType = openType(openedFullType,
choice.getDecl()->
getPotentialGenericDeclContext());
refType = openType(refType,
choice.getDecl()->getPotentialGenericDeclContext());
if (auto FT = openedFullType->getAs<FunctionType>()) {
auto returnType = FT->getResult();
addConstraint(ConstraintKind::Bind, returnType, refType);
}
}
// Add the type binding constraint.