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

Do not thread through Assert terminator.

Browse Source
This commit is contained in:
Camille GILLOT 2024-01-20 19:11:59 +00:00
parent d7a7be4049
commit afaac75ac7
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,11 +566,6 @@ impl<'tcx, 'a> TOFinder<'tcx, 'a> {
cost: &CostChecker<'_, 'tcx>, cost: &CostChecker<'_, 'tcx>,
depth: usize, depth: usize,
) { ) {
let register_opportunity = |c: Condition| {
debug!(?bb, ?c.target, "register");
self.opportunities.push(ThreadingOpportunity { chain: vec![bb], target: c.target })
};
let term = self.body.basic_blocks[bb].terminator(); let term = self.body.basic_blocks[bb].terminator();
let place_to_flood = match term.kind { let place_to_flood = match term.kind {
// We come from a target, so those are not possible. // We come from a target, so those are not possible.
@ -592,16 +587,8 @@ impl<'tcx, 'a> TOFinder<'tcx, 'a> {
// Flood the overwritten place, and progress through. // Flood the overwritten place, and progress through.
TerminatorKind::Drop { place: destination, .. } TerminatorKind::Drop { place: destination, .. }
| TerminatorKind::Call { destination, .. } => Some(destination), | TerminatorKind::Call { destination, .. } => Some(destination),
// Treat as an `assume(cond == expected)`. // Ignore, as this can be a no-op at codegen time.
TerminatorKind::Assert { ref cond, expected, .. } => { TerminatorKind::Assert { .. } => None,
if let Some(place) = cond.place()
&& let Some(conditions) = state.try_get(place.as_ref(), self.map)
{
let expected = if expected { ScalarInt::TRUE } else { ScalarInt::FALSE };
conditions.iter_matches(expected).for_each(register_opportunity);
}
None
}
}; };
// We can recurse through this terminator. // We can recurse through this terminator.