From 6614ed0e90176bb2d233fc579a8cd5beb247aa89 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 25 Jan 2022 13:03:46 +1100 Subject: [PATCH] Tweak liveness analysis for while loops --- internal/cgen/liveness.go | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/internal/cgen/liveness.go b/internal/cgen/liveness.go index 3fe51ee7..893c6659 100644 --- a/internal/cgen/liveness.go +++ b/internal/cgen/liveness.go @@ -429,28 +429,22 @@ func (h *livenessHelper) doWhile(r livenesses, n *a.While, depth uint32) error { h.loops[n] = l copy(l.before, r) - if err := h.doExpr(r, n.Condition()); err != nil { - return err - } - copy(l.after, r) - - for { - copy(r, l.after) - if err := h.doBlock(r, n.Body(), depth); err != nil { - return err - } - l.changed = l.before.reconcile(r) || l.changed + for l.changed = true; l.changed; { + l.changed = false copy(r, l.before) + if err := h.doExpr(r, n.Condition()); err != nil { return err + } else { + l.changed = l.after.reconcile(r) || l.changed } - l.changed = l.after.reconcile(r) || l.changed - if !l.changed { - break + if err := h.doBlock(r, n.Body(), depth); err != nil { + return err + } else { + l.changed = l.before.reconcile(r) || l.changed } - l.changed = false } copy(r, l.after)