bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #77549 - tmiasko:simplify-branch-same-fix, r=oli-obk

Browse source 
Fix miscompile in SimplifyBranchSame

Cherry-picked from #77486, but with a different test case that used to be compiled incorrectly on both master & beta branches.
This commit is contained in:
bors 2020-10-05 11:41:59 +00:00
commit d890e64dff
2 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_mir/src/transform/simplify_try.rs
View file

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