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

[AST] Narrow TypeSubstitutionMap to SubstitutableType keys.

Browse Source 
Type substitution works on a fairly narrow set of types: generic type
parameters (to, e.g., use a generic) and archetypes (to map out of a
generic context). Historically, it was also used with
DependentMemberTypes, but recent refactoring to eliminate witness
markers eliminate that code path.

Therefore, narrow TypeSubstitutionMap's keys to SubstitutableType,
which covers archetypes and generic type parameters. NFC
This commit is contained in:
Doug Gregor
2016-11-15 11:34:09 -08:00
parent 6bfd219e14
commit 85ba4fe40f
14 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/AST/Module.cpp
View File

@@ -595,7 +595,8 @@ TypeBase::gatherAllSubstitutions(Module *module,
unsigned index = lastGenericIndex - boundGeneric->getGenericArgs().size();
for (Type arg : boundGeneric->getGenericArgs()) {
auto paramTy = genericParams[index++];
substitutions[paramTy->getCanonicalType().getPointer()] = arg;
substitutions[
paramTy->getCanonicalType()->castTo<GenericTypeParamType>()] = arg;
}
lastGenericIndex -= boundGeneric->getGenericArgs().size();
@@ -618,8 +619,9 @@ TypeBase::gatherAllSubstitutions(Module *module,
parentDC = parentDC->getParent();
if (auto *outerEnv = parentDC->getGenericEnvironmentOfContext()) {
for (auto gp : outerEnv->getGenericParams()) {
auto result = substitutions.insert({gp->getCanonicalType().getPointer(),
outerEnv->mapTypeIntoContext(gp)});
auto result = substitutions.insert(
{gp->getCanonicalType()->castTo<GenericTypeParamType>(),
outerEnv->mapTypeIntoContext(gp)});
assert(result.second);
}
}