Skip to content

Commit 80d5017

Browse files
simonvandeltmiasko
authored andcommitted
Fix miscompile in SimplifyBranchSame
1 parent 4ccf5f7 commit 80d5017

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

compiler/rustc_mir/src/transform/simplify_try.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,8 @@ impl<'a, 'tcx> SimplifyBranchSameOptimizationFinder<'a, 'tcx> {
630630
// All successor basic blocks must be equal or contain statements that are pairwise considered equal.
631631
for ((target_and_value_l,bb_l), (target_and_value_r,bb_r)) in iter_bbs_reachable.tuple_windows() {
632632
let trivial_checks = bb_l.is_cleanup == bb_r.is_cleanup
633-
&& bb_l.terminator().kind == bb_r.terminator().kind;
633+
&& bb_l.terminator().kind == bb_r.terminator().kind
634+
&& bb_l.statements.len() == bb_r.statements.len();
634635
let statement_check = || {
635636
bb_l.statements.iter().zip(&bb_r.statements).try_fold(StatementEquality::TrivialEqual, |acc,(l,r)| {
636637
let stmt_equality = self.statement_equality(*adt_matched_on, &l, target_and_value_l, &r, target_and_value_r);

0 commit comments

Comments
 (0)