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

Sema: Don't overwrite parameter types in createDesignatedInitOverride()

Browse Source
This commit is contained in:
Slava Pestov
2019-08-13 16:54:24 -04:00
parent a06e5d0d2e
commit 2eb31facf7
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Sema/CodeSynthesis.cpp
View File

@@ -648,20 +648,27 @@ createDesignatedInitOverride(ClassDecl *classDecl,
// Determine the initializer parameters.
// Create the initializer parameter patterns.
OptionSet<ParameterList::CloneFlags> options = ParameterList::Implicit;
options |= ParameterList::Inherited;
auto *bodyParams = superclassCtor->getParameters()->clone(ctx, options);
OptionSet<ParameterList::CloneFlags> options
= (ParameterList::Implicit |
ParameterList::Inherited |
ParameterList::WithoutTypes);
auto *superclassParams = superclassCtor->getParameters();
auto *bodyParams = superclassParams->clone(ctx, options);
// If the superclass is generic, we need to map the superclass constructor's
// parameter types into the generic context of our class.
//
// We might have to apply substitutions, if for example we have a declaration
// like 'class A : B<Int>'.
for (auto *decl : *bodyParams) {
auto paramTy = decl->getInterfaceType();
for (unsigned idx : range(superclassParams->size())) {
auto *superclassParam = superclassParams->get(idx);
auto *bodyParam = bodyParams->get(idx);
auto paramTy = superclassParam->getInterfaceType();
auto substTy = paramTy.subst(subMap, SubstFlags::UseErrorType);
decl->setInterfaceType(substTy);
decl->getTypeLoc() = TypeLoc::withoutLoc(substTy);
bodyParam->setInterfaceType(substTy);
bodyParam->getTypeLoc() = TypeLoc::withoutLoc(substTy);
}
// Create the initializer declaration, inheriting the name,