Skip to content

[5.0][GSB] When adding same-type requirements pick representative based ... #20810

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 3 commits into from
Nov 28, 2018

Conversation

xedin
Copy link
Contributor

@xedin xedin commented Nov 27, 2018

... on canonical order

Instead of trying to order based on the "nested depth", let's
always prefer canonical ordering of type parameters when it comes
to picking representative equivalence class.

Resolves: rdar://problem/45957015

… canonical order

Instead of trying to order based on the "nested depth", let's
always prefer canonical ordering of type parameters when it comes
to picking representative equivalence class.

Resolves: rdar://problem/45957015
(cherry picked from commit c725660)
Instead of using `std::sort`, transform source-ordered edge vector
to reference `IntercomponentEdge *` instead of their indices in
`intercomponentEdges` vector and use `llvm::array_pod_sort` to sort them.

(cherry picked from commit 439784d)
@xedin xedin requested a review from DougGregor November 27, 2018 22:50
@xedin xedin requested a review from a team as a code owner November 27, 2018 22:50
@xedin
Copy link
Contributor Author

xedin commented Nov 27, 2018

@swift-ci please test

Copy link
Contributor

@AnnaZaks AnnaZaks left a comment

Choose a reason for hiding this comment

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

This is fixing a submission blocker. Doug reviewed the patch on master.

@xedin xedin merged commit ddc8208 into swiftlang:swift-5.0-branch Nov 28, 2018
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