Skip to content

trans::mir::constant - fix assignment error recovery #43568

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Aug 1, 2017
Merged

trans::mir::constant - fix assignment error recovery #43568

merged 2 commits into from
Aug 1, 2017

Conversation

arielb1
Copy link
Contributor

@arielb1 arielb1 commented Jul 31, 2017 •
edited
Loading

trans::mir::constant - fix assignment error recovery

We used to not store anything when the RHS of an assignment returned an error, which caused ICEs downstream.

Fixes #43197.

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@arielb1 arielb1 changed the title Constant recovery trans::mir::constant - fix assignment error recovery Jul 31, 2017
@arielb1
Copy link
Contributor Author

arielb1 commented Jul 31, 2017

r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned nikomatsakis Jul 31, 2017
@carols10cents carols10cents added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 31, 2017
arielb1 added 2 commits July 31, 2017 18:09
@arielb1
fix -Z treat-err-as-bug
1057a72
@arielb1
trans::mir::constant - fix assignment error recovery
93db1f9 
We used to not store anything when the RHS of an assignment returned an
error, which caused ICEs downstream.

Fixes rust-lang#43197.
@arielb1 arielb1 force-pushed the constant-recovery branch from c643589 to 93db1f9 Compare July 31, 2017 15:09
@eddyb
Copy link
Member

eddyb commented Jul 31, 2017

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 31, 2017

📌 Commit 93db1f9 has been approved by eddyb

@ghost
Copy link

ghost commented Jul 31, 2017 •
edited by ghost
Loading

Come on bors, merge this baby :) I can't wait!
or is the current github status preventing that?

19:13 CEST We are continuing to investigate an elevated error rate in web requests to GitHub.com.
18:32 CEST Major service outage.
18:27 CEST Minor service outage.

or does it need another r+ for the second commit? 1057a72
EDIT: oh nevermind that looks like it's the first commit according to timestamp.
EDIT2: got it, it's "S-waiting-on-review label" :D
EDIT3: i was wrong again, see below

@kennytm
Copy link
Member

kennytm commented Jul 31, 2017

@xftroxgpx You could see bors's progress in https://buildbot2.rust-lang.org/homu/queue/rust. Currently it is at the 3rd place in the queue, so you will need to wait for at least 6 hours before this PR got tested.

bors added a commit that referenced this pull request Aug 1, 2017
@bors
Auto merge of #43568 - arielb1:constant-recovery, r=eddyb
c240751 
trans::mir::constant - fix assignment error recovery

trans::mir::constant - fix assignment error recovery

We used to not store anything when the RHS of an assignment returned an error, which caused ICEs downstream.

Fixes #43197.
@bors
Copy link
Collaborator

bors commented Aug 1, 2017

⌛ Testing commit 93db1f9 with merge c240751...

@bors
Copy link
Collaborator

bors commented Aug 1, 2017

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

@bors bors merged commit 93db1f9 into rust-lang:master Aug 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@eddyb eddyb

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

1.18.0 and nightly ICE: /checkout/src/librustc_trans/mir/constant.rs:377: _1 not initialized
7 participants
@arielb1 @rust-highfive @eddyb @bors @kennytm @nikomatsakis @carols10cents