Skip to content
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

Fix try grandparent commit from ordering incorrectly #1164

Merged
merged 2 commits into from
Jan 31, 2022

Conversation

Mark-Simulacrum
Copy link
Member

This is a larger PR than I was hoping for, but this area of the code is actually somewhat tested (and this PR adds another test). In some ways I think the new code is also cleaner, which seems like a nice win.

Happy to receive suggestions on how to further clean it up.

Resolves #1163

Guarantees that commits are never benchmarked before their parents. The previous
algorithm only ensured that the parents of try commits had this ordering, but in
doing so promoted regular master commits into the wrong order in some cases.
Copy link
Contributor

@nnethercote nnethercote left a comment

Choose a reason for hiding this comment

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

I don't know this code at all but it seems reasonable, and as you say the test gives confidence.

@Mark-Simulacrum Mark-Simulacrum merged commit f9ff743 into rust-lang:master Jan 31, 2022
@Mark-Simulacrum Mark-Simulacrum deleted the fix-double-parent branch January 31, 2022 22:08
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.

Missing start commit for 90891
2 participants