nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 01:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make polarity an enum.

Browse Source
This commit is contained in:
Camille GILLOT 2023-10-17 18:40:06 +00:00
parent b5aa1ef9b4
commit 47056248e5
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
compiler/rustc_mir_transform/src/jump_threading.rs
View File

@ -11,9 +11,9 @@
//! looking for assignments that will turn the `SwitchInt` into a simple `Goto`. //! looking for assignments that will turn the `SwitchInt` into a simple `Goto`.
//! //!
//! The algorithm maintains a set of replacement conditions: //! The algorithm maintains a set of replacement conditions:
//! - `conditions[place]` contains `Condition { value, polarity: true, target }` //! - `conditions[place]` contains `Condition { value, polarity: Eq, target }`
//! if assigning `value` to `place` turns the `SwitchInt` into `Goto { target }`. //! if assigning `value` to `place` turns the `SwitchInt` into `Goto { target }`.
//! - `conditions[place]` contains `Condition { value, polarity: false, target }` //! - `conditions[place]` contains `Condition { value, polarity: Ne, target }`
//! if assigning anything different from `value` to `place` turns the `SwitchInt` //! if assigning anything different from `value` to `place` turns the `SwitchInt`
//! into `Goto { target }`. //! into `Goto { target }`.
//! //!
@ -98,13 +98,13 @@ impl<'tcx> MirPass<'tcx> for JumpThreading {
continue; continue;
}; };
arena.alloc_from_iter([ arena.alloc_from_iter([
Condition { value, polarity: true, target: then }, Condition { value, polarity: Polarity::Eq, target: then },
Condition { value, polarity: false, target: else_ }, Condition { value, polarity: Polarity::Ne, target: else_ },
]) ])
} else { } else {
arena.alloc_from_iter(targets.iter().filter_map(|(value, target)| { arena.alloc_from_iter(targets.iter().filter_map(|(value, target)| {
let value = ScalarInt::try_from_uint(value, discr_layout.size)?; let value = ScalarInt::try_from_uint(value, discr_layout.size)?;
Some(Condition { value, polarity: true, target }) Some(Condition { value, polarity: Polarity::Eq, target })
})) }))
}; };
let conds = ConditionSet(conds); let conds = ConditionSet(conds);
@ -149,18 +149,26 @@ struct TOFinder<'tcx, 'a> {
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
struct Condition { struct Condition {
value: ScalarInt, value: ScalarInt,
/// `true` means `==`, `false` means `!=` polarity: Polarity,
polarity: bool,
target: BasicBlock, target: BasicBlock,
} }
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
enum Polarity {
Ne,
Eq,
}
impl Condition { impl Condition {
fn matches(&self, value: ScalarInt) -> bool { fn matches(&self, value: ScalarInt) -> bool {
(self.value == value) == self.polarity (self.value == value) == (self.polarity == Polarity::Eq)
} }
fn inv(mut self) -> Self { fn inv(mut self) -> Self {
self.polarity = !self.polarity; self.polarity = match self.polarity {
Polarity::Eq => Polarity::Ne,
Polarity::Ne => Polarity::Eq,
};
self self
} }
} }
@ -455,7 +463,11 @@ impl<'tcx, 'a> TOFinder<'tcx, 'a> {
.try_to_scalar_int()?; .try_to_scalar_int()?;
let conds = conditions.map(self.arena, |c| Condition { let conds = conditions.map(self.arena, |c| Condition {
value, value,
polarity: c.matches(equals), polarity: if c.matches(equals) {
Polarity::Eq
} else {
Polarity::Ne
},
..c ..c
}); });
state.insert_value_idx(place, conds, self.map); state.insert_value_idx(place, conds, self.map);
@ -560,7 +572,7 @@ impl<'tcx, 'a> TOFinder<'tcx, 'a> {
// Likewise, we know that `discr != value`. That's a must weaker information, // Likewise, we know that `discr != value`. That's a must weaker information,
// so we can only match the exact same condition. // so we can only match the exact same condition.
for c in conditions.iter() { for c in conditions.iter() {
if c.value == value && c.polarity == false { if c.value == value && c.polarity == Polarity::Ne {
debug!(?target_bb, ?c.target, "register"); debug!(?target_bb, ?c.target, "register");
self.opportunities self.opportunities
.push(ThreadingOpportunity { chain: vec![], target: c.target }); .push(ThreadingOpportunity { chain: vec![], target: c.target });