bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #79777 - tmiasko:remove-first-merge, r=lcnr

Browse source 
Remove `first_merge` from liveness debug logs
This commit is contained in:
Tyler Mandry 2020-12-09 13:38:20 -08:00 • committed by GitHub
commit 2cca5e11e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/rustc_passes/src/liveness.rs
View file

@ -781,19 +781,13 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
debug!("init_from_succ(ln={}, succ={})", self.ln_str(ln), self.ln_str(succ_ln)); debug!("init_from_succ(ln={}, succ={})", self.ln_str(ln), self.ln_str(succ_ln));
} }
fn merge_from_succ(&mut self, ln: LiveNode, succ_ln: LiveNode, first_merge: bool) -> bool { fn merge_from_succ(&mut self, ln: LiveNode, succ_ln: LiveNode) -> bool {
if ln == succ_ln { if ln == succ_ln {
return false; return false;
} }
let changed = self.rwu_table.union(ln, succ_ln); let changed = self.rwu_table.union(ln, succ_ln);
debug!( debug!("merge_from_succ(ln={:?}, succ={}, changed={})", ln, self.ln_str(succ_ln), changed);
"merge_from_succ(ln={:?}, succ={}, first_merge={}, changed={})",
ln,
self.ln_str(succ_ln),
first_merge,
changed
);
changed changed
} }
@ -893,7 +887,6 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
}; };
// Propagate through calls to the closure. // Propagate through calls to the closure.
let mut first_merge = true;
loop { loop {
self.init_from_succ(self.closure_ln, succ); self.init_from_succ(self.closure_ln, succ);
for param in body.params { for param in body.params {
@ -903,10 +896,9 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
}) })
} }
if !self.merge_from_succ(self.exit_ln, self.closure_ln, first_merge) { if !self.merge_from_succ(self.exit_ln, self.closure_ln) {
break; break;
} }
first_merge = false;
assert_eq!(succ, self.propagate_through_expr(&body.value, self.exit_ln)); assert_eq!(succ, self.propagate_through_expr(&body.value, self.exit_ln));
} }
@ -1012,7 +1004,6 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
// //
let ln = self.live_node(expr.hir_id, expr.span); let ln = self.live_node(expr.hir_id, expr.span);
self.init_empty(ln, succ); self.init_empty(ln, succ);
let mut first_merge = true;
for arm in arms { for arm in arms {
let body_succ = self.propagate_through_expr(&arm.body, succ); let body_succ = self.propagate_through_expr(&arm.body, succ);
@ -1021,8 +1012,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
body_succ, body_succ,
); );
let arm_succ = self.define_bindings_in_pat(&arm.pat, guard_succ); let arm_succ = self.define_bindings_in_pat(&arm.pat, guard_succ);
self.merge_from_succ(ln, arm_succ, first_merge); self.merge_from_succ(ln, arm_succ);
first_merge = false;
} }
self.propagate_through_expr(&e, ln) self.propagate_through_expr(&e, ln)
} }
@ -1133,7 +1123,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
let ln = self.live_node(expr.hir_id, expr.span); let ln = self.live_node(expr.hir_id, expr.span);
self.init_from_succ(ln, succ); self.init_from_succ(ln, succ);
self.merge_from_succ(ln, r_succ, false); self.merge_from_succ(ln, r_succ);
self.propagate_through_expr(&l, ln) self.propagate_through_expr(&l, ln)
} }
@ -1377,7 +1367,6 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
*/ */
// first iteration: // first iteration:
let mut first_merge = true;
let ln = self.live_node(expr.hir_id, expr.span); let ln = self.live_node(expr.hir_id, expr.span);
self.init_empty(ln, succ); self.init_empty(ln, succ);
debug!("propagate_through_loop: using id for loop body {} {:?}", expr.hir_id, body); debug!("propagate_through_loop: using id for loop body {} {:?}", expr.hir_id, body);
@ -1389,8 +1378,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
let body_ln = self.propagate_through_block(body, ln); let body_ln = self.propagate_through_block(body, ln);
// repeat until fixed point is reached: // repeat until fixed point is reached:
while self.merge_from_succ(ln, body_ln, first_merge) { while self.merge_from_succ(ln, body_ln) {
first_merge = false;
assert_eq!(body_ln, self.propagate_through_block(body, ln)); assert_eq!(body_ln, self.propagate_through_block(body, ln));
} }