Skip to content

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

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 12, 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

…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
@xedin xedin requested a review from DougGregor June 12, 2019 17:14
@xedin
Copy link
Contributor Author

xedin commented Jun 12, 2019

@swift-ci please smoke test

@xedin
Copy link
Contributor Author

xedin commented Jun 12, 2019

@swift-ci please test source compatibility

@xedin
Copy link
Contributor Author

xedin commented Jun 12, 2019

@swift-ci please test source compatibility debug

@xedin
Copy link
Contributor Author

xedin commented Jun 12, 2019

@swift-ci please build toolchain

@swift-ci
Copy link
Contributor

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - ba6a5e1

Install command
tar zxf swift-PR-25383-240-ubuntu16.04.tar.gz
More info

@swift-ci
Copy link
Contributor

macOS Toolchain
Download Toolchain
Git Sha - ba6a5e1

Install command
tar -zxf swift-PR-25383-313-osx.tar.gz --directory ~/

@xedin xedin merged commit 735a884 into swiftlang:master Jun 12, 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.

3 participants