bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #134073 - DianQK:fix-131227, r=oli-obk

Browse source 
dataflow_const_prop: do not eval a ptr address in SwitchInt

Fixes #131227.
This commit is contained in:
León Orell Valerian Liehr 2024-12-09 23:39:07 +01:00 • committed by GitHub
commit cb5f03cbce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 26 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_mir_transform/src/dataflow_const_prop.rs
View file

@ -534,8 +534,13 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> {
// This allows the set of visited edges to grow monotonically with the lattice.
FlatSet::Bottom => TerminatorEdges::None,
FlatSet::Elem(scalar) => {
let choice = scalar.assert_scalar_int().to_bits_unchecked();
TerminatorEdges::Single(targets.target_for_value(choice))
if let Ok(scalar_int) = scalar.try_to_scalar_int() {
TerminatorEdges::Single(
targets.target_for_value(scalar_int.to_bits_unchecked()),
)
} else {
TerminatorEdges::SwitchInt { discr, targets }
}
}
FlatSet::Top => TerminatorEdges::SwitchInt { discr, targets },
}