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

ICH: Handle case of removed FileMaps. #41873

Merged
merged 1 commit into from
May 11, 2017

Conversation

michaelwoerister
Copy link
Member

This PR fixes a bug introduced in #41709 where removing a source file between compilation sessions would cause an ICE:
https://travis-ci.org/rust-icci/crossbeam/jobs/230582234#L633

r? @nikomatsakis

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 10, 2017

📌 Commit 84a40c1 has been approved by nikomatsakis

frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 10, 2017
…ookup, r=nikomatsakis

ICH: Handle case of removed FileMaps.

This PR fixes a bug introduced in rust-lang#41709 where removing a source file between compilation sessions would cause an ICE:
https://travis-ci.org/rust-icci/crossbeam/jobs/230582234#L633

r? @nikomatsakis
@TimNN TimNN added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 10, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 11, 2017
…ookup, r=nikomatsakis

ICH: Handle case of removed FileMaps.

This PR fixes a bug introduced in rust-lang#41709 where removing a source file between compilation sessions would cause an ICE:
https://travis-ci.org/rust-icci/crossbeam/jobs/230582234#L633

r? @nikomatsakis
frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 11, 2017
…ookup, r=nikomatsakis

ICH: Handle case of removed FileMaps.

This PR fixes a bug introduced in rust-lang#41709 where removing a source file between compilation sessions would cause an ICE:
https://travis-ci.org/rust-icci/crossbeam/jobs/230582234#L633

r? @nikomatsakis
bors added a commit that referenced this pull request May 11, 2017
Rollup of 5 pull requests

- Successful merges: #41192, #41724, #41873, #41877, #41889
- Failed merges:
@bors bors merged commit 84a40c1 into rust-lang:master May 11, 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.

4 participants