Skip to content

incr.comp.: Make sanity check in try_mark_green() aware of error conditions. #49088

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
Mar 17, 2018

Conversation

michaelwoerister
Copy link
Member

Before this PR, DepGraph::try_mark_green() assumed that forcing a query would always set the color of the corresponding dep-node. However, it did not take into account that queries could also fail (e.g. with a cycle error). This PR makes the method handle that condition gracefully.

Fixes #49070.

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 16, 2018
@nikomatsakis
Copy link
Contributor

@bors r+ p=1

Assigning high priority as this is a regression fix.

@bors
Copy link
Collaborator

bors commented Mar 16, 2018

📌 Commit ee4a7eb has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 16, 2018
@bors
Copy link
Collaborator

bors commented Mar 16, 2018

⌛ Testing commit ee4a7eb with merge 7abe916c741e9da9c4334c6ed24473cf29eef6df...

@bors
Copy link
Collaborator

bors commented Mar 16, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 16, 2018
@alexcrichton
Copy link
Member

@bors: retry

another appveyor timeout...

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 16, 2018
@bors
Copy link
Collaborator

bors commented Mar 17, 2018

⌛ Testing commit ee4a7eb with merge cf5cc2e...

bors added a commit that referenced this pull request Mar 17, 2018
incr.comp.: Make sanity check in try_mark_green() aware of error conditions.

Before this PR, `DepGraph::try_mark_green()` assumed that forcing a query would always set the color of the corresponding dep-node. However, it did not take into account that queries could also fail (e.g. with a cycle error). This PR makes the method handle that condition gracefully.

Fixes #49070.

r? @nikomatsakis
@bors
Copy link
Collaborator

bors commented Mar 17, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing cf5cc2e to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants