Skip to content

Sema: Fix logic error in TypeReprCycleCheckWalker handling of 'Self.Foo' #70830

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
Jan 11, 2024
+18 −1
Merged

Sema: Fix logic error in TypeReprCycleCheckWalker handling of 'Self.Foo' #70830

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
3 changes: 2 additions & 1 deletion lib/Sema/TypeCheckProtocolInference.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ struct TypeReprCycleCheckWalker : ASTWalker {

// If we're inferring `Foo`, don't look at a witness mentioning `Self.Foo`.
if (auto *identTyR = dyn_cast<SimpleIdentTypeRepr>(baseTyR)) {
if (identTyR->getNameRef().getBaseIdentifier() == ctx.Id_Self) {
if (identTyR->getNameRef().getBaseIdentifier() == ctx.Id_Self &&
circularNames.count(memberTyR->getNameRef().getBaseIdentifier()) > 0) {
// But if qualified lookup can find a type with this name without
// looking into protocol members, don't skip the witness, since this
// type might be a candidate witness.
Expand Down
16 changes: 16 additions & 0 deletions test/decl/protocol/req/assoc_type_inference_cycle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,19 @@ public struct LogTypes: OptionSet {

public let rawValue: Int
}

// rdar://120743365
public struct G<T> {}

public protocol HasAlias {
typealias A = G<Self>
associatedtype B

func f1(_: Self.A, _: Self.B)
func f2(_: Self.A, _: Self.B)
}

public struct ConformsHasAlias: HasAlias {
public func f1(_: Self.A, _: Self.B) {}
public func f2(_: Self.A, _: Int) {}
}