Fix ICE when compiling nightly std/rustc on beta compiler#89785
Merged
bors merged 1 commit intorust-lang:masterfrom Oct 12, 2021
Merged
Fix ICE when compiling nightly std/rustc on beta compiler#89785bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
|
r? @wesleywiser (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Member
|
Does this fix just that particular bug? I'd expect all the other diagnostic items to cause similar issues, though I guess only if particular codepaths execute... |
Member
Author
|
For other diagnostic items, worse diagnostics may be produced when bootstrapping, but this one causes ICE. Given that we are close to the next release I think we can wait for other diagnostic items... |
Member
|
@bors r+ rollup |
Collaborator
|
📌 Commit 148f456 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 12, 2021
…askrgr Rollup of 9 pull requests Successful merges: - rust-lang#89471 (Use Ancestory to check default fn in const impl instead of comparing idents) - rust-lang#89643 (Fix inherent impl overlap check.) - rust-lang#89651 (Add `Poll::ready` and revert stabilization of `task::ready!`) - rust-lang#89675 (Re-use TypeChecker instead of passing around some of its fields ) - rust-lang#89710 (Add long explanation for error E0482) - rust-lang#89756 (Greatly reduce amount of debuginfo compiled for bootstrap itself) - rust-lang#89760 (Remove hack ignoring unused attributes for stage 0 std) - rust-lang#89772 (Fix function-names test for GDB 10.1) - rust-lang#89785 (Fix ICE when compiling nightly std/rustc on beta compiler) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix #89775
#89479 renames a lot of diagnostic items, but it happens that the beta compiler assumes that there must be DefId with
rustc_diagnostic_item = "send_trait", causing an ICE when compiling stage 0 std or stage 1 compiler. So gate it withcfg(bootstrap).The unwrap is also removed, so that existence of the diagnostic item is not required. I ripgreped the code base and this seems the only place where
unwrapis called on the return value ofget_diagnostic_item.