diff options
| author | DianQK <dianqk@dianqk.net> | 2024-12-09 20:25:41 +0800 |
|---|---|---|
| committer | DianQK <dianqk@dianqk.net> | 2024-12-09 21:06:29 +0800 |
| commit | d0986f45e094b011d132238563b05c09e4f1e20e (patch) | |
| tree | 0b78a7e65bbba6f4250ae4f998a61c82b9a0a3ed /compiler/rustc_mir_transform/src | |
| parent | 1b3fb316751227d30b1523ed0e3f00d83956d4d0 (diff) | |
| download | rust-d0986f45e094b011d132238563b05c09e4f1e20e.tar.gz rust-d0986f45e094b011d132238563b05c09e4f1e20e.zip | |
dataflow_const_prop: do not eval a ptr address in SwitchInt
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/dataflow_const_prop.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/dataflow_const_prop.rs b/compiler/rustc_mir_transform/src/dataflow_const_prop.rs index d017202f48b..b94c925b1db 100644 --- a/compiler/rustc_mir_transform/src/dataflow_const_prop.rs +++ b/compiler/rustc_mir_transform/src/dataflow_const_prop.rs @@ -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 }, } |
