mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make dataflow const-prop handle_switch_int monotonic.

Browse Source
This commit is contained in:
Camille GILLOT 2023-05-29 10:29:54 +00:00
parent e9990ce89c
commit b8fed2f21c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_mir_transform/src/dataflow_const_prop.rs
View File

@ -257,15 +257,18 @@ impl<'tcx> ValueAnalysis<'tcx> for ConstAnalysis<'_, 'tcx> {
ValueOrPlace::Value(value) => value, ValueOrPlace::Value(value) => value,
ValueOrPlace::Place(place) => state.get_idx(place, self.map()), ValueOrPlace::Place(place) => state.get_idx(place, self.map()),
}; };
let FlatSet::Elem(ScalarTy(scalar, _)) = value else { match value {
// Do nothing if we don't know which branch will be taken. // We are branching on uninitialized data, this is UB, treat it as unreachable.
return TerminatorEdges::SwitchInt { discr, targets }; // This allows the set of visited edges to grow monotonically with the lattice.
}; FlatSet::Bottom => TerminatorEdges::None,
FlatSet::Elem(ScalarTy(scalar, _)) => {
let int = scalar.assert_int(); let int = scalar.assert_int();
let choice = int.assert_bits(int.size()); let choice = int.assert_bits(int.size());
TerminatorEdges::Single(targets.target_for_value(choice)) TerminatorEdges::Single(targets.target_for_value(choice))
} }
FlatSet::Top => TerminatorEdges::SwitchInt { discr, targets },
}
}
} }
#[derive(Clone, PartialEq, Eq)] #[derive(Clone, PartialEq, Eq)]