Skip to content

GSB: Watch out for a concrete ResolvedType in ArchetypeType::resolveNestedType #33859

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 26 additions & 11 deletions lib/AST/GenericSignatureBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2632,16 +2632,27 @@ void ArchetypeType::resolveNestedType(
Type interfaceType = getInterfaceType();
Type memberInterfaceType =
DependentMemberType::get(interfaceType, nested.first);
auto equivClass =
builder.resolveEquivalenceClass(
memberInterfaceType,
ArchetypeResolutionKind::CompleteWellFormed);
if (!equivClass) {
const auto resolved = builder.maybeResolveEquivalenceClass(
memberInterfaceType, ArchetypeResolutionKind::CompleteWellFormed,
/*wantExactPotentialArchetype=*/false);
if (!resolved) {
nested.second = ErrorType::get(interfaceType);
return;
}
Comment on lines +2637 to 2641
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we assert instead?


auto result = equivClass->getTypeInContext(builder, genericEnv);
Type result;
if (const auto concrete = resolved.getAsConcreteType()) {
result = concrete;
} else {
auto *const equivClass = resolved.getEquivalenceClass(builder);
if (!equivClass) {
nested.second = ErrorType::get(interfaceType);
return;
}

result = equivClass->getTypeInContext(builder, genericEnv);
}

assert(!nested.second ||
nested.second->isEqual(result) ||
(nested.second->hasError() && result->hasError()));
Expand Down Expand Up @@ -3696,12 +3707,16 @@ ResolvedType GenericSignatureBuilder::maybeResolveEquivalenceClass(
EquivalenceClass *GenericSignatureBuilder::resolveEquivalenceClass(
Type type,
ArchetypeResolutionKind resolutionKind) {
if (auto resolved =
maybeResolveEquivalenceClass(type, resolutionKind,
/*wantExactPotentialArchetype=*/false))
return resolved.getEquivalenceClass(*this);
const auto resolved =
maybeResolveEquivalenceClass(type, resolutionKind,
/*wantExactPotentialArchetype=*/false);
if (!resolved)
return nullptr;

return nullptr;
if (resolved.getAsConcreteType())
return nullptr;

return resolved.getEquivalenceClass(*this);
}

auto GenericSignatureBuilder::resolve(UnresolvedType paOrT,
Expand Down
18 changes: 18 additions & 0 deletions validation-test/compiler_crashers_2_fixed/sr13519.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// RUN: %target-swift-frontend %s -typecheck

// https://bugs.swift.org/browse/SR-13519

class Class: P {
typealias A = Bool
}
protocol P {
associatedtype A
}
protocol Q: P {
func takesA(arg: A)
}

func test<T: Class & Q>(arg: T) {
arg.takesA(arg: true)
}