From: Andy Wingo <wingo@pobox.com>
Date: Fri, 4 Jul 2014 07:18:36 +0000 (+0200)
Subject: Small type-fold cleanup
X-Git-Url: https://git.hcoop.net/bpt/guile.git/commitdiff_plain/c7b71b1fdd53fbc1753006e0201ce26a16b61f9a

Small type-fold cleanup

* module/language/cps/type-fold.scm (fold-constants*): Remove stale
  branches that were there when we only type folded on limited-size
  branches.
---

diff --git a/module/language/cps/type-fold.scm b/module/language/cps/type-fold.scm
index 6fc48c452..0c7d1d5c7 100644
--- a/module/language/cps/type-fold.scm
+++ b/module/language/cps/type-fold.scm
@@ -249,8 +249,7 @@
              (($ $continue k src (and fun ($ $fun)))
               ($continue k src ,(visit-fun fun)))
              (($ $continue k src (and primcall ($ $primcall)))
-              ,(if (and folded?
-                        (bitvector-ref folded? (label->idx label)))
+              ,(if (bitvector-ref folded? (label->idx label))
                    (let ((val (vector-ref folded-values (label->idx label))))
                      ;; Uncomment for debugging.
                      ;; (pk 'folded src primcall val)
@@ -263,8 +262,7 @@
                            ($continue k* src ,primcall)))))
                    term))
              (($ $continue kf src ($ $branch kt ($ $primcall)))
-              ,(if (and folded?
-                        (bitvector-ref folded? (label->idx label)))
+              ,(if (bitvector-ref folded? (label->idx label))
                    ;; Folded branch.
                    (let ((val (vector-ref folded-values (label->idx label))))
                      (build-cps-term