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

Sema: Don't build ErrorTypes in simplifyType()

Browse Source 
Instead, just build a new dependent member type with the
simplified base type.
This commit is contained in:
Slava Pestov
2017-06-05 21:43:34 -07:00
parent 1bd91dee5c
commit 56b61ba758
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Sema/ConstraintSystem.cpp
View File

@@ -1700,17 +1700,17 @@ Type simplifyTypeImpl(ConstraintSystem &cs, Type type, Fn getFixedTypeFn) {
lookupBaseType = objectType;
}
if (!lookupBaseType->mayHaveMembers()) return type;
auto subs = lookupBaseType->getContextSubstitutionMap(
if (lookupBaseType->mayHaveMembers()) {
auto subs = lookupBaseType->getContextSubstitutionMap(
cs.DC->getParentModule(),
assocType->getDeclContext());
auto result = assocType->getDeclaredInterfaceType().subst(subs);
assocType->getDeclContext());
auto result = assocType->getDeclaredInterfaceType().subst(subs);
if (result)
return result;
if (result)
return result;
}
return DependentMemberType::get(ErrorType::get(newBase), assocType);
return DependentMemberType::get(lookupBaseType, assocType);
}
return type;