GSB: use a request for the structural type of type aliases #24204
Conversation
|
@swift-ci Please smoke test |
xymus
force-pushed
the
structural-type-request
branch
from
191fdc5 to
d3b7306
Compare
xymus
changed the title
|
@swift-ci Please smoke test |
xymus
force-pushed
the
structural-type-request
branch
from
d3b7306 to
44c9459
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
|
Fix looks good |
|
@swift-ci Please smoke test macOS |
…iases This request evaluator doesn't rely on the previous execution of a compilation phase but it caches the result in a compatible way.
xymus
force-pushed
the
structural-type-request
branch
from
58f6c5e to
9e6713d
Compare
|
@swift-ci Please smoke test macOS |
|
@swift-ci Please smoke test Linux |
|
@swift-ci Please test source compatibility |
lib/Sema/TypeCheckGeneric.cpp
Outdated
| TypeAliasDecl *D) const { | ||
| auto typeRepr = D->getUnderlyingTypeLoc().getTypeRepr(); | ||
| auto resolution = TypeResolution::forStructural(D); | ||
| return resolution.resolveType(typeRepr, None); |
There was a problem hiding this comment.
You need to use the same options as in validateTypeAliasType():
TypeResolutionOptions options(
(typeAlias->getGenericParams() ?
TypeResolverContext::GenericTypeAliasDecl :
TypeResolverContext::TypeAliasDecl));
if (!typeAlias->getDeclContext()->isCascadingContextForLookup(
/*functionsAreNonCascading*/true)) {
options |= TypeResolutionFlags::KnownNonCascadingDependency;
}
For now you can just copy and paste that code, we'll factor it out later.
There was a problem hiding this comment.
... however a generic type alias will never end up here, so you remove that part. In fact, can you assert(!getGenericParams()) in TypeAliasDecl::getStructuralType()?
…l type request The underlying type may have been set on a validated type alias or when deserialized.
xymus
force-pushed
the
structural-type-request
branch
from
9e6713d to
c27dca3
Compare
|
@swift-ci Please smoke test macOS |
|
@swift-ci Please smoke test Linux |
|
@swift-ci Please test source compatibility |
|
It looks like expandConformanceRequirement() needs to skip generic type aliases altogether. |
|
... and generic types in general. They're not something the GSB tries to model anyway. |
Fixes crashes in 28437-swift-typechecker-validatedecl.swift (from previous commit) and the compiler crasher 28861-gpdecl-getdepth-generictypeparamdecl- invaliddepth-parameter-hasnt-been-validated.swift.
|
@swift-ci Please smoke test macOS |
|
@swift-ci Please smoke test Linux |
|
@swift-ci Please test source compatibility |
|
@swift-ci Please smoke test Linux |
No description provided.