Skip to content

Commit

Permalink
Don't ICE if TAIT-defining fn contains a closure with _ in return type
Browse files Browse the repository at this point in the history
  • Loading branch information
Lukas Markeffsky committed Jan 15, 2024
1 parent 665d2c6 commit 79b8fa5
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 3 deletions.
13 changes: 10 additions & 3 deletions compiler/rustc_hir_analysis/src/collect/type_of/opaque.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,16 @@ impl TaitConstraintLocator<'_> {
return;
}

if let Some(hir_sig) = self.tcx.hir_node_by_def_id(item_def_id).fn_decl() {
if hir_sig.output.get_infer_ret_ty().is_some() {
// Function items with `_` in their return type already emit an error, skip any
// "non-defining use" errors for them.
match self.tcx.hir_node_by_def_id(item_def_id) {
Node::TraitItem(TraitItem { kind: hir::TraitItemKind::Fn(fn_sig, _), .. })
| Node::ImplItem(ImplItem { kind: hir::ImplItemKind::Fn(fn_sig, _), .. })
| Node::Item(Item { kind: hir::ItemKind::Fn(fn_sig, _, _), .. })
if fn_sig.decl.output.get_infer_ret_ty().is_some() =>
{
let guar = self.tcx.dcx().span_delayed_bug(
hir_sig.output.span(),
fn_sig.decl.output.span(),
"inferring return types and opaque types do not mix well",
);
self.found = Some(ty::OpaqueHiddenType {
Expand All @@ -147,6 +153,7 @@ impl TaitConstraintLocator<'_> {
});
return;
}
_ => {}
}

// Calling `mir_borrowck` can lead to cycle errors through
Expand Down
35 changes: 35 additions & 0 deletions tests/ui/type-alias-impl-trait/closure_infer.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// check-pass

// Regression test for an ICE: https://github.com/rust-lang/rust/issues/119916

#![feature(impl_trait_in_assoc_type)]
#![feature(type_alias_impl_trait)]

// `impl_trait_in_assoc_type` example from the bug report.
pub trait StreamConsumer {
type BarrierStream;
fn execute() -> Self::BarrierStream;
}

pub struct DispatchExecutor;

impl StreamConsumer for DispatchExecutor {
type BarrierStream = impl Sized;
fn execute() -> Self::BarrierStream {
|| -> _ {}
}
}

// Functions that constrain TAITs can contain closures with an `_` in the return type.
type Foo = impl Sized;
fn foo() -> Foo {
|| -> _ {}
}

// The `_` in the closure return type can also be the TAIT itself.
type Bar = impl Sized;
fn bar() -> impl FnOnce() -> Bar {
|| -> _ {}
}

fn main() {}

0 comments on commit 79b8fa5

Please sign in to comment.