Skip to content

/rust

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

incr.comp.: Fix two problems with HIR hashing. #45551

Merged
merged 2 commits into from Oct 31, 2017

Conversation

Reviewers

@nikomatsakis nikomatsakis

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
4 participants
@michaelwoerister @nikomatsakis @bors @kennytm
@michaelwoerister
Copy link
Contributor

michaelwoerister commented Oct 26, 2017

Fixes #45469.

This PR fixes two small problems:

  • Overflow checks are always enabled in a constant context, so we need to hash spans of potentially overflowing operations. (Eventually I'd like to handle spans differently so we don't have to make HIR hashing know so much about things like this.)
  • The HIR map collector had a bug where it would assign the DepNode::Hir instead of the corresponding DepNode::HirBody in some nested contexts.

r? @nikomatsakis

@rust-highfive rust-highfive assigned nikomatsakis Oct 26, 2017

@kennytm kennytm added the S-waiting-on-review label Oct 26, 2017

@nikomatsakis

nikomatsakis approved these changes Oct 30, 2017
View changes

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor

nikomatsakis commented Oct 30, 2017

@bors r+
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Oct 30, 2017

📌 Commit 10ffff8 has been approved by nikomatsakis

@kennytm kennytm added S-waiting-on-bors and removed S-waiting-on-review labels Oct 30, 2017

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Oct 31, 2017

⌛️ Testing commit 10ffff8 with merge 6713736...

bors added a commit that referenced this pull request Oct 31, 2017

@bors
Auto merge of #45551 - michaelwoerister:fix-hir-depnodes-and-ich, r=n… 
…ikomatsakis

incr.comp.: Fix two problems with HIR hashing.

Fixes #45469.

This PR fixes two small problems:
* Overflow checks are always enabled in a constant context, so we need to hash spans of potentially overflowing operations. (Eventually I'd like to handle spans differently so we don't have to make HIR hashing know so much about things like this.)
* The HIR map collector had a bug where it would assign the `DepNode::Hir` instead of the corresponding `DepNode::HirBody` in some nested contexts.

r? @nikomatsakis
Loading status checks…
6713736
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Oct 31, 2017

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

@bors bors merged commit 10ffff8 into rust-lang:master Oct 31, 2017
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.