wingo pushed a commit to branch master
in repository guile.
commit 51fd5952cb9e45f850e606a682c17b7609dd72ca
Author: Andy Wingo <[email protected]>
Date: Fri Jan 5 10:40:03 2018 +0100
Disable resolve-primitives pass below -O2
* module/language/tree-il/optimize.scm (optimize): Disable
resolve-primitives below -O2. This is because compile-cps is going to
start expanding all primcalls it sees.
---
module/language/tree-il/optimize.scm | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/module/language/tree-il/optimize.scm
b/module/language/tree-il/optimize.scm
index 1bd0c79..13b0977 100644
--- a/module/language/tree-il/optimize.scm
+++ b/module/language/tree-il/optimize.scm
@@ -28,16 +28,30 @@
#:export (optimize
tree-il-optimizations))
+(define (kw-arg-ref args kw default)
+ (match (memq kw args)
+ ((_ val . _) val)
+ (_ default)))
+
+(define *debug?* #f)
+
+(define (maybe-verify x)
+ (if *debug?*
+ (verify-tree-il x)
+ x))
+
(define (optimize x env opts)
- (let ((peval (match (memq #:partial-eval? opts)
- ((#:partial-eval? #f _ ...)
- ;; Disable partial evaluation.
- (lambda (x e) x))
- (_ peval))))
- (fix-letrec
- (verify-tree-il
- (peval (expand-primitives (resolve-primitives x env))
- env)))))
+ (define-syntax-rule (run-pass pass kw default)
+ (when (kw-arg-ref opts kw default)
+ (set! x (maybe-verify (pass x)))))
+ (define (resolve* x) (resolve-primitives x env))
+ (define (peval* x) (peval x env))
+ (maybe-verify x)
+ (run-pass resolve* #:resolve-primitives? #t)
+ (run-pass expand-primitives #:expand-primitives? #t)
+ (run-pass peval* #:partial-eval? #t)
+ (run-pass fix-letrec #:fix-letrec? #t)
+ x)
(define (tree-il-optimizations)
;; Avoid resolve-primitives until -O2, when CPS optimizations kick in.
