Skip to content

[5.0] [Type checker] Make sure we wire up generic parameters of a context. #21036

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
Dec 5, 2018
Merged

[5.0] [Type checker] Make sure we wire up generic parameters of a context. #21036

Show file tree
Hide file tree
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
9 changes: 6 additions & 3 deletions lib/Sema/TypeChecker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,15 +304,18 @@ static void prepareGenericParamList(GenericParamList *genericParams) {
/// context have been configured.
static void configureOuterGenericParams(const GenericContext *dc) {
auto genericParams = dc->getGenericParams();
if (!genericParams) return;

if (genericParams->getOuterParameters()) return;
// If we already configured the outer parameters, we're done.
if (genericParams && genericParams->getOuterParameters())
return;

DeclContext *outerDC = dc->getParent();
while (!outerDC->isModuleScopeContext()) {
if (auto outerDecl = outerDC->getAsDecl()) {
if (auto outerGenericDC = outerDecl->getAsGenericContext()) {
genericParams->setOuterParameters(outerGenericDC->getGenericParams());
if (genericParams)
genericParams->setOuterParameters(outerGenericDC->getGenericParams());

configureOuterGenericParams(outerGenericDC);
return;
}
Expand Down
10 changes: 10 additions & 0 deletions test/decl/ext/generic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,13 @@ struct A<T, U, V> {
extension A.B.C where T == V, X == Z.Assoc2 {
func f() { }
}

// Extensions of nested non-generics within generics.
extension A.B {
struct D { }
}

extension A.B.D {
func g() { }
}