Skip to content

[5.1][ConstraintSystem] Replace special locator for return of single expr … #25409

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
Jun 13, 2019

Conversation

xedin
Copy link
Contributor

@xedin xedin commented Jun 12, 2019

…function with a flag on contextual type locator

It's only needed in one place in the constraint solver to allow
() -> T to () -> () and () -> Never to () -> T for expressions
representing return of a single expression functions, so to simplify
contextual type handling in diagnostic and other places it would be
better to replace dedicated locator kind with a flag on existing ContextualType.

Resolves: rdar://problem/51641323
(cherry picked from commit ba6a5e1)

…function with a flag on contextual type locator

It's only needed in one place in the constraint solver to allow
`() -> T` to `() -> ()` and `() -> Never` to `() -> T` for expressions
representing return of a single expression functions, so to simplify
contextual type handling in diagnostic and other places it would be
better to replace dedicated locator kind with a flag on existing `ContextualType`.

Resolves: rdar://problem/51641323
(cherry picked from commit ba6a5e1)
@xedin
Copy link
Contributor Author

xedin commented Jun 12, 2019

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - a844bcf

@xedin
Copy link
Contributor Author

xedin commented Jun 13, 2019

@swift-ci please test macOS platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - a844bcf

@xedin
Copy link
Contributor Author

xedin commented Jun 13, 2019

@swift-ci please test Linux platform

@xedin xedin merged commit 44abeb4 into swiftlang:swift-5.1-branch Jun 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants