Skip to content

Commit

Permalink
Disable jump threading UnOp::Not for non-bool
Browse files Browse the repository at this point in the history
(cherry picked from commit f0bfba2)
  • Loading branch information
compiler-errors authored and cuviper committed Oct 11, 2024
1 parent 692821d commit 0fb2b24
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 2 deletions.
8 changes: 8 additions & 0 deletions compiler/rustc_mir_transform/src/jump_threading.rs
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,16 @@ impl<'tcx, 'a> TOFinder<'tcx, 'a> {
}
// Transfer the conditions on the copy rhs, after inversing polarity.
Rvalue::UnaryOp(UnOp::Not, Operand::Move(place) | Operand::Copy(place)) => {
if !place.ty(self.body, self.tcx).ty.is_bool() {
// Constructing the conditions by inverting the polarity
// of equality is only correct for bools. That is to say,
// `!a == b` is not `a != b` for integers greater than 1 bit.
return;
}
let Some(conditions) = state.try_get_idx(lhs, self.map) else { return };
let Some(place) = self.map.find(place.as_ref()) else { return };
// FIXME: I think This could be generalized to not bool if we
// actually perform a logical not on the condition's value.
let conds = conditions.map(self.arena, Condition::inv);
state.insert_value_idx(place, conds, self.map);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
- // MIR for `bitwise_not` before JumpThreading
+ // MIR for `bitwise_not` after JumpThreading

fn bitwise_not() -> i32 {
let mut _0: i32;
let mut _1: i32;
let mut _2: bool;
let mut _3: i32;
let mut _4: i32;
scope 1 {
debug a => _1;
}

bb0: {
StorageLive(_1);
_1 = const 0_i32;
_1 = const 1_i32;
StorageLive(_2);
StorageLive(_3);
StorageLive(_4);
_4 = copy _1;
_3 = Not(move _4);
StorageDead(_4);
_2 = Eq(move _3, const 0_i32);
switchInt(move _2) -> [0: bb2, otherwise: bb1];
}

bb1: {
StorageDead(_3);
_0 = const 1_i32;
goto -> bb3;
}

bb2: {
StorageDead(_3);
_0 = const 0_i32;
goto -> bb3;
}

bb3: {
StorageDead(_2);
StorageDead(_1);
return;
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
_3 = Not(move _4);
StorageDead(_4);
_2 = Eq(move _3, const 0_i32);
- switchInt(move _2) -> [0: bb2, otherwise: bb1];
+ goto -> bb1;
switchInt(move _2) -> [0: bb2, otherwise: bb1];
}

bb1: {
Expand Down

0 comments on commit 0fb2b24

Please sign in to comment.