Skip to content

Commit 92cba20

Browse files
committed
fixup! simplifycfg: Preserve debuginfos when merging bbs
use `?` use `successors.all`
1 parent 06f5ac8 commit 92cba20

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

compiler/rustc_middle/src/mir/terminator.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -448,15 +448,8 @@ impl<'tcx> Terminator<'tcx> {
448448
#[inline]
449449
pub fn identical_successor(&self) -> Option<BasicBlock> {
450450
let mut successors = self.successors();
451-
let Some(first_succ) = successors.next() else {
452-
return None;
453-
};
454-
while let Some(succ) = successors.next() {
455-
if first_succ != succ {
456-
return None;
457-
}
458-
}
459-
Some(first_succ)
451+
let first_succ = successors.next()?;
452+
if successors.all(|succ| first_succ == succ) { Some(first_succ) } else { None }
460453
}
461454

462455
#[inline]

0 commit comments

Comments
 (0)