Skip to content

[CSSyntaticElement] Canonicalize type before collecting "in scope" va… #65071

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

Merged
merged 1 commit into from
Apr 12, 2023
Merged
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
2 changes: 1 addition & 1 deletion lib/Sema/CSSyntacticElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class TypeVariableRefFinder : public ASTWalker {
// For example `Typealias<$T, $U>.Context` which desugars into
// `_Context<$U>` would bring in `$T` that could be inferrable
// only after the body of the closure is solved.
type = type->getDesugaredType();
type = type->getCanonicalType();

// Don't walk into the opaque archetypes because they are not
// transparent in this context - `some P` could reference a
Expand Down
4 changes: 2 additions & 2 deletions validation-test/Sema/SwiftUI/rdar107835060.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct TestView<Data, Content: View> : View {
typealias Context = Content._Context where Content: ContentProtocol

init<R, C>(_ data: Data,
@ViewBuilder shelfContent: @escaping (Context) -> C)
@ViewBuilder shelfContent: @escaping ([Context]) -> C)
where Data.Element == any Model<R>,
Content == ContinuousContent<LazyMapCollection<Data, AnyModel<R>>, C> {
}
Expand All @@ -44,7 +44,7 @@ struct TestView<Data, Content: View> : View {
func test(values: [any Model<[Int]>]) -> some View {
TestView(values) { context in
VStack {
if context.offset == 0 {
if context.first?.offset == 0 {
}
}
}
Expand Down