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

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

Merged
merged 2 commits into from
Oct 31, 2017

Conversation

michaelwoerister
Copy link
Member

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

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 26, 2017
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Oct 30, 2017

📌 Commit 10ffff8 has been approved by nikomatsakis

@kennytm kennytm 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 Oct 30, 2017
@bors
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
…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
@bors
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
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.

incr.comp.: Changed span of panic message not detected
4 participants