fix issue #78496
This commit is contained in:
parent
8080f54677
commit
c6f2d49ff8
@ -283,6 +283,34 @@ impl<'a, 'tcx> Helper<'a, 'tcx> {
|
|||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// when one place is the projection of the other, it's not safe to calculate their discriminant values sequentially.
|
||||||
|
// for example, this should not be optimized:
|
||||||
|
//
|
||||||
|
// ```rust
|
||||||
|
// enum E<'a> { Empty, Some(&'a E<'a>), }
|
||||||
|
// let Some(Some(_)) = e;
|
||||||
|
// ```
|
||||||
|
//
|
||||||
|
// ```mir
|
||||||
|
// bb0: {
|
||||||
|
// _2 = discriminant(*_1)
|
||||||
|
// switchInt(move _2) -> [...]
|
||||||
|
// }
|
||||||
|
// bb1: {
|
||||||
|
// _3 = discriminant(*(((*_1) as Some).0: &E))
|
||||||
|
// switchInt(move _3) -> [...]
|
||||||
|
// }
|
||||||
|
// ```
|
||||||
|
let discr_place = discr_info.place_of_adt_discr_read;
|
||||||
|
let this_discr_place = this_bb_discr_info.place_of_adt_discr_read;
|
||||||
|
if discr_place.local == this_discr_place.local
|
||||||
|
&& (discr_place.projection.starts_with(this_discr_place.projection)
|
||||||
|
|| this_discr_place.projection.starts_with(discr_place.projection))
|
||||||
|
{
|
||||||
|
trace!("NO: one target is the projection of another");
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
|
||||||
// if we reach this point, the optimization applies, and we should be able to optimize this case
|
// if we reach this point, the optimization applies, and we should be able to optimize this case
|
||||||
// store the info that is needed to apply the optimization
|
// store the info that is needed to apply the optimization
|
||||||
|
|
||||||
|
16
src/test/ui/mir/issue-78496.rs
Normal file
16
src/test/ui/mir/issue-78496.rs
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
// run-pass
|
||||||
|
// compile-flags: -Z mir-opt-level=2 -C opt-level=0
|
||||||
|
|
||||||
|
// example from #68867
|
||||||
|
pub enum E<'a> {
|
||||||
|
Empty,
|
||||||
|
Some(&'a E<'a>),
|
||||||
|
}
|
||||||
|
|
||||||
|
fn f(e: &E) -> u32 {
|
||||||
|
if let E::Some(E::Some(_)) = e { 1 } else { 2 }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
assert_eq!(f(&E::Empty), 2);
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user