Skip to content

[pull] swiftwasm-release/5.7 from release/5.7 #4846

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 2 commits into from
Sep 1, 2022
Merged

[pull] swiftwasm-release/5.7 from release/5.7 #4846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1580386
[ConstraintSystem] Fix result builder discovery in leading-dot syntax…
xedin Aug 31, 2022
6560c13
Merge pull request #60881 from xedin/issue-60586-5.7
xedin Aug 31, 2022
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
4 changes: 3 additions & 1 deletion lib/Sema/CSSimplify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9866,7 +9866,9 @@ static Type getOpenedResultBuilderTypeFor(ConstraintSystem &cs,
auto *calleeLocator = cs.getCalleeLocator(cs.getConstraintLocator(locator));
auto selectedOverload = cs.findSelectedOverloadFor(calleeLocator);
if (!(selectedOverload &&
selectedOverload->choice.getKind() == OverloadChoiceKind::Decl))
(selectedOverload->choice.getKind() == OverloadChoiceKind::Decl ||
selectedOverload->choice.getKind() ==
OverloadChoiceKind::DeclViaUnwrappedOptional)))
return Type();

auto *choice = selectedOverload->choice.getDecl();
Expand Down
16 changes: 16 additions & 0 deletions test/Constraints/result_builder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,3 +1198,19 @@ func test_callAsFunction_with_resultBuilder() {
test_callAsFunction_with_resultBuilder()
// CHECK: (0, "with parens", true)
// CHECK: (1, "without parens", true)

do {
struct S {
static func test<T>(@TupleBuilder _ body: (Bool) -> T) -> S {
print(body(true))
return .init()
}
}

let _: S? = .test {
42
""
[$0]
}
// CHECK: (42, "", [true])
}