Skip to content

TypeCheckType: Minor resolveTypeInContext simplification #78285

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 19, 2024
Merged

TypeCheckType: Minor resolveTypeInContext simplification #78285

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
17 changes: 9 additions & 8 deletions lib/Sema/TypeCheckType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,16 +449,17 @@ Type TypeResolution::resolveTypeInContext(TypeDecl *typeDecl,
for (auto *parentDC = fromDC; !parentDC->isModuleScopeContext();
parentDC = parentDC->getParentForLookup()) {
auto *parentNominal = parentDC->getSelfNominalTypeDecl();
if (!parentNominal) {
continue;
}

if (parentNominal == nominalType)
return parentDC->getDeclaredInterfaceType();
if (isa<ExtensionDecl>(parentDC)) {
auto *extendedType = parentNominal;
while (extendedType != nullptr) {
if (extendedType == nominalType)
return extendedType->getDeclaredInterfaceType();
extendedType = extendedType->getParent()->getSelfNominalTypeDecl();
}
}

// `parentDC` is either a nominal or an extension thereof. Either way,
// continue climbing up the nominal. Do not to climb up an extension
// because they are not allowed to be nested.
parentDC = parentNominal;
}
}

Expand Down