Skip to content

A handful of independent changes from #27695 #27696

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 6 commits into from
Oct 15, 2019

Conversation

hamishknight
Copy link
Contributor

This PR contains the commits which can land independently of #27695, with no intended functionality change.

hamishknight and others added 6 commits October 15, 2019 10:12
Array-to-pointer should only be used for such conversions. This isn't
currently an issue as we short-circuit disjunctions upon successfully
solving an array-to-pointer conversion. However this would become an
issue if only inout-to-pointer was viable.
This lets us add a constraint to the system with an associated fix.
Unlike `addUnsolvedConstraint`, this will attempt to immediately
simplify the constraint, producing an unsolved constraint if necessary.
@hamishknight
Copy link
Contributor Author

@swift-ci please smoke test

@hamishknight hamishknight requested a review from xedin October 15, 2019 17:28
@xedin
Copy link
Contributor

xedin commented Oct 15, 2019

This looks like FC to me :)

@hamishknight hamishknight changed the title A handful of NFC changes from #27695 A handful of independent changes from #27695 Oct 15, 2019
@hamishknight
Copy link
Contributor Author

@xedin Fair enough :) Note though that we assert in the ASTVerifier if we end up with inout-to-pointer being used for a raw pointer: https://github.com/apple/swift/blob/f8209f2865bb05d85aafb5c08e14960cfc6df042/lib/AST/ASTVerifier.cpp#L1400-L1407

@hamishknight hamishknight merged commit 3818a16 into swiftlang:master Oct 15, 2019
@hamishknight hamishknight deleted the odds-n-ends branch October 15, 2019 21:47
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