bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #120817 - compiler-errors:more-mir-errors, r=oli-obk

Browse source 
Fix more `ty::Error` ICEs in MIR passes

Fixes #120791 - Add a check for `ty::Error` in the `ByMove` coroutine pass
Fixes #120816 - Add a check for `ty::Error` in the MIR validator

Also a drive-by fix for a FIXME I had asked oli to add

r? oli-obk
This commit is contained in:
Matthias Krüger 2024-02-09 14:41:51 +01:00 • committed by GitHub
commit 116efb5bb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 73 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
compiler/rustc_mir_build/src/build/mod.rs
View file

@ -675,16 +675,32 @@ fn construct_error(tcx: TyCtxt<'_>, def_id: LocalDefId, guar: ErrorGuaranteed) -
))),
)
}
ty::CoroutineClosure(did, _args) => {
// FIXME(async_closures): Recover the proper error signature
let inputs = tcx
.closure_user_provided_sig(did.expect_local())
.value
.skip_binder()
.inputs();
let err = Ty::new_error(tcx, guar);
(inputs.iter().map(|_| err).collect(), err, None)
ty::CoroutineClosure(did, args) => {
let args = args.as_coroutine_closure();
let sig = tcx.liberate_late_bound_regions(
def_id.to_def_id(),
args.coroutine_closure_sig(),
);
let self_ty = match args.kind() {
ty::ClosureKind::Fn => {
Ty::new_imm_ref(tcx, tcx.lifetimes.re_erased, closure_ty)
}
ty::ClosureKind::FnMut => {
Ty::new_mut_ref(tcx, tcx.lifetimes.re_erased, closure_ty)
}
ty::ClosureKind::FnOnce => closure_ty,
};
(
[self_ty].into_iter().chain(sig.tupled_inputs_ty.tuple_fields()).collect(),
sig.to_coroutine(
tcx,
args.parent_args(),
args.kind_ty(),
tcx.coroutine_for_closure(*did),
Ty::new_error(tcx, guar),
),
None,
)
}
ty::Error(_) => (vec![closure_ty, closure_ty], closure_ty, None),
kind => {