[AST] Eliminate ModuleDecl parameters from GenericSignature.

This commit is contained in:
Doug Gregor
2017-10-09 17:31:05 -07:00
parent 936a701b15
commit 1f1b75a56d
24 changed files with 96 additions and 130 deletions

View File

@@ -715,8 +715,7 @@ ReabstractionInfo::createSubstitutedType(SILFunction *OrigF,
// account by the substGenericArgs. So, canonicalize in the context of the
// specialized signature.
FnTy = cast<SILFunctionType>(
CanSpecializedGenericSig->getCanonicalTypeInContext(
FnTy, *M.getSwiftModule()));
CanSpecializedGenericSig->getCanonicalTypeInContext(FnTy));
}
assert(FnTy);
@@ -1345,7 +1344,7 @@ void FunctionSignaturePartialSpecializer::
for (auto GP : CalleeGenericSig->getGenericParams()) {
auto CanTy = GP->getCanonicalType();
auto CanTyInContext =
CalleeGenericSig->getCanonicalTypeInContext(CanTy, *SM);
CalleeGenericSig->getCanonicalTypeInContext(CanTy);
auto Replacement = CanTyInContext.subst(CalleeInterfaceToCallerArchetypeMap);
DEBUG(llvm::dbgs() << "\n\nChecking callee generic parameter:\n";
CanTy->dump());