Skip to content

[SE-0326] Re-enable multi-statement closure inference by default #41730

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

Jump to bottom
Merged
merged 6 commits into from
Mar 15, 2022
Merged

[SE-0326] Re-enable multi-statement closure inference by default #41730

merged 6 commits into from
Mar 15, 2022

Conversation

xedin
Copy link
Contributor

@xedin xedin commented Mar 8, 2022 •
edited
Loading

Fixes a performance regression related to one-way constraints and re-enables
multi-statement closure inference by default.

The changes include:

  • New locator for each pattern binding element
  • Recording a type of a named pattern declaration in a constraint system
  • Solving pattern bindings declarations via conjunctions

Resolves: rdar://88205521

xedin added 2 commits March 7, 2022 10:51
@xedin
[ConstraintLocator] Add a new element - pattern binding element
9d5ee7a 
The new element points to an index of a particular pattern in a
pattern binding declaration.
@xedin
[Tests] NFC: Adjust all the test-cases improved by multi-statement in…
966f58f 
…ference
@xedin xedin requested a review from hborla March 8, 2022 20:07
@xedin
Copy link
Contributor Author

xedin commented Mar 8, 2022

@swift-ci please test source compatibility

@xedin
Copy link
Contributor Author

xedin commented Mar 8, 2022

@swift-ci please test

@xedin
Copy link
Contributor Author

xedin commented Mar 8, 2022

@swift-ci please test source compatibility

@xedin
Copy link
Contributor Author

xedin commented Mar 8, 2022

@shahmishal FYI source compat suite is failing with [/Users/ec2-user/jenkins/workspace-private/swift-PR-source-compat-suite-macos/swift/utils/build-script] ERROR: can't find CMake (please install CMake)

@xedin
Copy link
Contributor Author

xedin commented Mar 9, 2022

@swift-ci please test source compatibility

LucianoPAlmeida
LucianoPAlmeida reviewed Mar 9, 2022
View reviewed changes
@xedin
Copy link
Contributor Author

xedin commented Mar 9, 2022

There are a couple of unrelated issues in the source compatibility suite:

  • Eureka is crashing in request evaluator:
Cannot build interface type for term [OptionsProviderRow:OptionsProviderType].[OptionsProviderConformance:Option]
Prefix does not conform to any protocols: [OptionsProviderRow:OptionsProviderType]
  • Moya conformance failure:
error: type 'MoyaProvider<Target>' does not conform to protocol 'ReactiveCompatible'
extension MoyaProvider: ReactiveCompatible {}
  • SwiftGraph conformance failure due to unavailable subscript:
error: type 'Graph<V>' does not conform to protocol 'Collection'
open class Graph<V: Equatable>: CustomStringConvertible, Sequence, Collection {
           ^
/Users/ec2-user/jenkins/workspace/swift-PR-source-compat-suite-debug-macos/swift-source-compat-suite/project_cache/SwiftGraph/Sources/SwiftGraph/Graph.swift:22:12: error: unavailable subscript 'subscript(_:)' was used to satisfy a requirement of protocol 'Collection'
open class Graph<V: Equatable>: CustomStringConvertible, Sequence, Collection {
           ^

xedin added 4 commits March 8, 2022 21:37
@xedin
[CSGen] Always record a type of named pattern declaration
a5cff5a 
This is going to be used by multi-statement closure inference
because patterns could be declarated and referenced in the body
via the associated declaration.
@xedin
[Constraint] NFC: Improve debug output of pattern binding element con…
ceb78c0 
…straints
@xedin
[CSClosure] Explode pattern binding declarations into conjunctions
5c3fb22 
`one-way` constraints disable some optimizations related to component
selection because they imply strict ordering. This is a problem for
multi-statement closures because variable declarations could involve
complex operator expressions that rely on aforementioned optimizations.

In order to fix that, let's move away from solving whole pattern binding
declaration into scheme that explodes such declarations into indvidual
elements and inlines them into a conjunction.

For example:

```
let x = 42, y = x + 1, z = (x, test())
```

Would result in a conjunction of three elements:

```
x = 42
y = x + 1
z = (x, test())
```

Each element is solved indepedently, which eliminates the need for
`one-way` constraints and re-enables component selection optimizations.
@xedin
[TypeChecker] SE-0326: Enable multi-statement closure inference by de…
5e4c964 
…fault
@xedin xedin force-pushed the se-0326-solve-pattern-bindings-via-conjunctions branch from ffe26c3 to 5e4c964 Compare March 9, 2022 05:38
@shahmishal
Copy link
Member

@swift-ci please test source compatibility

@shahmishal
Copy link
Member

@shahmishal FYI source compat suite is failing with [/Users/ec2-user/jenkins/workspace-private/swift-PR-source-compat-suite-macos/swift/utils/build-script] ERROR: can't find CMake (please install CMake)

This should be fixed now.

@xedin
Copy link
Contributor Author

xedin commented Mar 9, 2022

@swift-ci please test source compatibility

@xedin
Copy link
Contributor Author

xedin commented Mar 9, 2022

@swift-ci please test

hborla
hborla approved these changes Mar 10, 2022
View reviewed changes
Copy link
Member

@hborla hborla left a comment

Choose a reason for hiding this comment

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

Awesome, lgtm!

@xedin
Copy link
Contributor Author

xedin commented Mar 15, 2022

@swift-ci please test

@xedin
Copy link
Contributor Author

xedin commented Mar 15, 2022

@swift-ci please test Linux platform

@xedin
Copy link
Contributor Author

xedin commented Mar 15, 2022

@swift-ci please test macOS platform

@xedin xedin merged commit 5331e27 into swiftlang:main Mar 15, 2022
@xedin xedin mentioned this pull request Mar 15, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LucianoPAlmeida LucianoPAlmeida LucianoPAlmeida left review comments

@hborla hborla hborla approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@xedin @shahmishal @LucianoPAlmeida @hborla