Skip to content

Fix ICE in return_type_impl_trait - #55800

Merged
bors merged 2 commits into
rust-lang:masterfrom
estebank:abolish-ice-for-lifetime
Nov 11, 2018
Merged

Fix ICE in return_type_impl_trait#55800
bors merged 2 commits into
rust-lang:masterfrom
estebank:abolish-ice-for-lifetime

Conversation

@estebank

Copy link
Copy Markdown
Contributor

Fix#55796.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @oli-obk

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 8, 2018
@estebankestebank changed the title Sidestep ICE in type_of_def_id() when called from return_type_impl_traitFix ICE in return_type_impl_traitNov 8, 2018
@estebankestebank added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 8, 2018
@estebank

Copy link
Copy Markdown
ContributorAuthor

Nominating for beta backport as it fixes a stable-to-stable regression ICE.

Comment threadsrc/librustc/ty/context.rs Outdated
@oli-obk

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 9, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit a90240d has been approved by oli-obk

@borsbors 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 Nov 9, 2018
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Nov 10, 2018
bors added a commit that referenced this pull request Nov 11, 2018
Rollup of 17 pull requests
Successful merges:
- #55630 (resolve: Filter away macro prelude in modules with `#[no_implicit_prelude]` on 2018 edition)
- #55687 (Take supertraits into account when calculating associated types)
- #55745 (Convert `outlives_components`' return value to a `SmallVec` outparam.)
- #55764 (Fix Rc/Arc allocation layout)
- #55792 (Prevent ICE in const-prop array oob check)
- #55799 (Removed unneeded instance of `// revisions` from a lint test)
- #55800 (Fix ICE in `return_type_impl_trait`)
- #55801 (NLL: Update box insensitivity test)
- #55802 (Don't inline virtual calls (take 2))
- #55816 (Use `SmallVec` to avoid allocations in `from_decimal_string`.)
- #55819 (Typecheck patterns of all match arms first, so we get types for bindings)
- #55822 (ICE with #![feature(nll)] and elided lifetimes)
- #55828 (Add missing `rustc_promotable` attribute to unsigned `min_value` and `max_value`)
- #55839 (Fix docstring spelling mistakes)
- #55844 (Fix documentation typos.)
- #55845 (Set BINARYEN_TRAP_MODE=clamp)
- #55856 (rustdoc: refactor: move all static-file include!s into a single module)
@bors
bors merged commit a90240d into rust-lang:masterNov 11, 2018
@nagisa

Copy link
Copy Markdown
Member

Has been approved for a backport. The fix does not look ideal, but we’ll have to live with it one way or another until the fix is improved.

@nagisanagisa added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 15, 2018
@emilyalbiniemilyalbini mentioned this pull request Nov 15, 2018
@emilyalbiniemilyalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 15, 2018
bors added a commit that referenced this pull request Nov 15, 2018
[beta] Rollup backports
Merged and approved:
* #55947: xLTO: Don't pass --plugin-opt=thin to LLD. That's not supported anymore.
* #55852: Rewrite `...` as `..=` as a `MachineApplicable` 2018 idiom lint
* #55800: Fix ICE in `return_type_impl_trait`
* #55630: resolve: Filter away macro prelude in modules with `#[no_implicit_prelude]` on 2018 edition
r? @ghost
bors added a commit that referenced this pull request Nov 15, 2018
[beta] Rollup backports
Merged and approved:
* #55947: xLTO: Don't pass --plugin-opt=thin to LLD. That's not supported anymore.
* #55800: Fix ICE in `return_type_impl_trait`
* #55630: resolve: Filter away macro prelude in modules with `#[no_implicit_prelude]` on 2018 edition
r? @ghost
bors added a commit that referenced this pull request Nov 16, 2018
[beta] Rollup backports
Merged and approved:
* #55947: xLTO: Don't pass --plugin-opt=thin to LLD. That's not supported anymore.
* #55800: Fix ICE in `return_type_impl_trait`
* #55630: resolve: Filter away macro prelude in modules with `#[no_implicit_prelude]` on 2018 edition
r? @ghost
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: 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.

6 participants

@estebank@rust-highfive@oli-obk@bors@nagisa@emilyalbini