Rollup merge of #114123 - oli-obk:tait_wtf, r=WaffleLapkin
Turns out opaque types can have hidden types registered during mir validation See the newly added test's documentation for an explanation. fixes #114121
This commit is contained in:
commit
218e88e5d8
2 changed files with 25 additions and 6 deletions
|
@ -57,12 +57,15 @@ pub fn is_subtype<'tcx>(
|
||||||
// we would get unification errors because we're unable to look into opaque types,
|
// we would get unification errors because we're unable to look into opaque types,
|
||||||
// even if they're constrained in our current function.
|
// even if they're constrained in our current function.
|
||||||
for (key, ty) in infcx.take_opaque_types() {
|
for (key, ty) in infcx.take_opaque_types() {
|
||||||
span_bug!(
|
let hidden_ty = tcx.type_of(key.def_id).instantiate(tcx, key.args);
|
||||||
ty.hidden_type.span,
|
if hidden_ty != ty.hidden_type.ty {
|
||||||
"{}, {}",
|
span_bug!(
|
||||||
tcx.type_of(key.def_id).instantiate(tcx, key.args),
|
ty.hidden_type.span,
|
||||||
ty.hidden_type.ty
|
"{}, {}",
|
||||||
);
|
tcx.type_of(key.def_id).instantiate(tcx, key.args),
|
||||||
|
ty.hidden_type.ty
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
errors.is_empty()
|
errors.is_empty()
|
||||||
}
|
}
|
||||||
|
|
16
tests/ui/type-alias-impl-trait/broken_mir.rs
Normal file
16
tests/ui/type-alias-impl-trait/broken_mir.rs
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
//! ICE: https://github.com/rust-lang/rust/issues/114121
|
||||||
|
//! This test checks that MIR validation never constrains
|
||||||
|
//! new hidden types that *differ* from the actual hidden types.
|
||||||
|
//! This test used to ICE because oli-obk assumed mir validation
|
||||||
|
//! was only ever run after opaque types were revealed in MIR.
|
||||||
|
|
||||||
|
// compile-flags: -Zvalidate-mir
|
||||||
|
// check-pass
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let _ = Some(()).into_iter().flat_map(|_| Some(()).into_iter().flat_map(func));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn func(_: ()) -> impl Iterator<Item = ()> {
|
||||||
|
Some(()).into_iter().flat_map(|_| vec![])
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue