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

SILOptimizer: Replace a few mapTypeOutOfContext() calls with ArchetypeType::getInterfaceType()

Browse Source
This commit is contained in:
Slava Pestov
2017-10-07 04:39:09 -07:00
parent 8484065491
commit e9dd4004c1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/SILOptimizer/Utils/Generics.cpp
View File

@@ -854,7 +854,7 @@ static bool hasNonSelfContainedRequirements(ArchetypeType *Archetype,
GenericSignature *Sig,
GenericEnvironment *Env) {
auto Reqs = Sig->getRequirements();
auto CurrentGP = Env->mapTypeOutOfContext(Archetype)
auto CurrentGP = Archetype->getInterfaceType()
->getCanonicalType()
->getRootGenericParam();
for (auto Req : Reqs) {
@@ -897,7 +897,7 @@ static void collectRequirements(ArchetypeType *Archetype, GenericSignature *Sig,
GenericEnvironment *Env,
SmallVectorImpl<Requirement> &CollectedReqs) {
auto Reqs = Sig->getRequirements();
auto CurrentGP = Env->mapTypeOutOfContext(Archetype)
auto CurrentGP = Archetype->getInterfaceType()
->getCanonicalType()
->getRootGenericParam();
CollectedReqs.clear();
@@ -1304,8 +1304,7 @@ void FunctionSignaturePartialSpecializer::
void FunctionSignaturePartialSpecializer::
createGenericParamsForUsedCallerArchetypes() {
for (auto CallerArchetype : UsedCallerArchetypes) {
auto CallerGenericParam =
CallerGenericEnv->mapTypeOutOfContext(CallerArchetype);
auto CallerGenericParam = CallerArchetype->getInterfaceType();
assert(CallerGenericParam->is<GenericTypeParamType>());
DEBUG(llvm::dbgs() << "\n\nChecking used caller archetype:\n";