Skip to content

IDE: Remove bogus use of getCanonicalTypeInContext() #38359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 13, 2021
Merged

IDE: Remove bogus use of getCanonicalTypeInContext() #38359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions lib/IDE/IDETypeChecking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ struct SynthesizedExtensionAnalyzer::Implementation {
bool Unmergable;
unsigned InheritsCount;
std::set<Requirement> Requirements;
void addRequirement(GenericSignature GenericSig, swift::Requirement Req) {
void addRequirement(swift::Requirement Req) {
auto First = Req.getFirstType();
auto CanFirst = GenericSig->getCanonicalTypeInContext(First);
auto CanFirst = First->getCanonicalType();
auto Second = Req.getSecondType();
auto CanSecond = GenericSig->getCanonicalTypeInContext(Second);
auto CanSecond = Second->getCanonicalType();

Requirements.insert({First, Second, Req.getKind(), CanFirst, CanSecond});
}
Expand Down Expand Up @@ -284,7 +284,6 @@ struct SynthesizedExtensionAnalyzer::Implementation {
}

auto handleRequirements = [&](SubstitutionMap subMap,
GenericSignature GenericSig,
ExtensionDecl *OwningExt,
ArrayRef<Requirement> Reqs) {
ProtocolDecl *BaseProto = OwningExt->getInnermostDeclContext()
Expand Down Expand Up @@ -336,7 +335,7 @@ struct SynthesizedExtensionAnalyzer::Implementation {
if (!SubstReq->canBeSatisfied())
return true;

MergeInfo.addRequirement(GenericSig, Req);
MergeInfo.addRequirement(Req);
}
}
return false;
Expand All @@ -355,7 +354,7 @@ struct SynthesizedExtensionAnalyzer::Implementation {

assert(Ext->getGenericSignature() && "No generic signature.");
auto GenericSig = Ext->getGenericSignature();
if (handleRequirements(subMap, GenericSig, Ext, GenericSig->getRequirements()))
if (handleRequirements(subMap, Ext, GenericSig->getRequirements()))
return {Result, MergeInfo};
}

Expand All @@ -366,7 +365,6 @@ struct SynthesizedExtensionAnalyzer::Implementation {
subMap = BaseType->getContextSubstitutionMap(M, NTD);
}
if (handleRequirements(subMap,
Conf->getGenericSignature(),
EnablingExt,
Conf->getConditionalRequirements()))
return {Result, MergeInfo};
Expand Down