Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix ICE in return_type_impl_trait #55800

Merged
merged 2 commits into from
Nov 11, 2018

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Nov 8, 2018

Fix #55796.

@rust-highfive
Copy link
Collaborator

r? @oli-obk

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

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

estebank commented Nov 8, 2018

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

@oli-obk
Copy link
Contributor

oli-obk commented Nov 9, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Nov 9, 2018

📌 Commit a90240d has been approved by oli-obk

@bors bors 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
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Nov 10, 2018
…r=oli-obk

Fix ICE in `return_type_impl_trait`

Fix rust-lang#55796.
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:master Nov 11, 2018
@nagisa
Copy link
Member

nagisa commented Nov 15, 2018

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.

@nagisa nagisa added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 15, 2018
@pietroalbini pietroalbini 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
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.

6 participants