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

Lift Requirement and Parameter Accessors up to GenericSignature

Browse Source 
Start treating the null {Can}GenericSignature as a regular signature
with no requirements and no parameters. This not only makes for a much
safer abstraction, but allows us to simplify a lot of the clients of
GenericSignature that would previously have to check for null before
using the abstraction.
This commit is contained in:
Robert Widmann
2021-07-14 19:05:28 -07:00
parent 9a1d18ae4f
commit d86551de67
61 changed files with 283 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/CodeSynthesis.cpp
View File

@@ -476,7 +476,7 @@ computeDesignatedInitOverrideSignature(ASTContext &ctx,
// than the depth of the subclass.
unsigned depth = 0;
if (auto genericSig = classDecl->getGenericSignature())
depth = genericSig->getGenericParams().back()->getDepth() + 1;
depth = genericSig.getGenericParams().back()->getDepth() + 1;
for (auto *param : genericParams->getParams()) {
auto *newParam = new (ctx) GenericTypeParamDecl(classDecl,
@@ -506,7 +506,7 @@ computeDesignatedInitOverrideSignature(ASTContext &ctx,
// The depth at which the initializer's own generic parameters start, if any.
unsigned superclassDepth = 0;
if (superclassSig)
superclassDepth = superclassSig->getGenericParams().back()->getDepth() + 1;
superclassDepth = superclassSig.getGenericParams().back()->getDepth() + 1;
// We're going to be substituting the requirements of the base class
// initializer to form the requirements of the derived class initializer.
@@ -537,7 +537,7 @@ computeDesignatedInitOverrideSignature(ASTContext &ctx,
};
SmallVector<Requirement, 2> requirements;
for (auto reqt : superclassCtorSig->getRequirements())
for (auto reqt : superclassCtorSig.getRequirements())
if (auto substReqt = reqt.subst(substFn, lookupConformanceFn))
requirements.push_back(*substReqt);
@@ -757,7 +757,7 @@ createDesignatedInitOverride(ClassDecl *classDecl,
// this initializer; there's no way to call it on the derived class.
auto checkResult = TypeChecker::checkGenericArguments(
classDecl->getParentModule(),
superclassCtorSig->getRequirements(),
superclassCtorSig.getRequirements(),
[&](Type type) -> Type {
auto substType = type.subst(overrideInfo.OverrideSubMap);
return GenericEnvironment::mapTypeIntoContext(