diff options
author | Andy Wingo <wingo@pobox.com> | 2020-05-13 08:59:04 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2020-05-13 09:04:16 +0200 |
commit | c5da9d65a7e7741535694ddebd8207a76294c922 (patch) | |
tree | 0b1e3f7ec7d4c8a2795293926a659d437b817e3f /module/language/tree-il/optimize.scm | |
parent | 132292fcb38b8cea11716bb208ed2ad35b1c3d45 (diff) | |
download | guile-c5da9d65a7e7741535694ddebd8207a76294c922.tar.gz |
Fix optimizers after language lowerer refactor
* module/language/cps/optimize.scm (define-optimizer):
(optimize-higher-order-cps, optimize-first-order-cps):
(make-cps-lowerer):
* module/language/tree-il/optimize.scm (optimize, make-lowerer): In an
embarrassing bug, after parsing optimization arguments, we were
aconsing them instead of the expected cons*. This meant the bootstrap
was running all Tree-IL optimizations! Change to have optimizers not
have defaults and use alists after parsing.
Diffstat (limited to 'module/language/tree-il/optimize.scm')
-rw-r--r-- | module/language/tree-il/optimize.scm | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/module/language/tree-il/optimize.scm b/module/language/tree-il/optimize.scm index 6c64e17c1..4fc75b6a7 100644 --- a/module/language/tree-il/optimize.scm +++ b/module/language/tree-il/optimize.scm @@ -32,11 +32,6 @@ make-lowerer tree-il-optimizations)) -(define (kw-arg-ref args kw default) - (match (memq kw args) - ((_ val . _) val) - (_ default))) - (define *debug?* #f) (define (maybe-verify x) @@ -45,27 +40,31 @@ x)) (define (optimize x env opts) - (define-syntax-rule (run-pass pass kw default) - (when (kw-arg-ref opts kw default) + (define-syntax-rule (run-pass pass kw) + (when (assq-ref opts kw) (set! x (maybe-verify (pass x))))) (define (resolve* x) (resolve-primitives x env)) (define (peval* x) (peval x env)) (define (letrectify* x) - (let ((seal? (kw-arg-ref opts #:seal-private-bindings? #f))) + (let ((seal? (assq-ref opts #:seal-private-bindings?))) (letrectify x #:seal-private-bindings? seal?))) (maybe-verify x) - (run-pass resolve* #:resolve-primitives? #t) - (run-pass expand-primitives #:expand-primitives? #t) - (run-pass letrectify* #:letrectify? #t) + (run-pass resolve* #:resolve-primitives?) + (run-pass expand-primitives #:expand-primitives?) + (run-pass letrectify* #:letrectify?) (set! x (fix-letrec x)) - (run-pass peval* #:partial-eval? #t) - (run-pass eta-expand #:eta-expand? #t) + (run-pass peval* #:partial-eval?) + (run-pass eta-expand #:eta-expand?) x) (define (tree-il-optimizations) (available-optimizations 'tree-il)) (define (make-lowerer optimization-level opts) + (define (kw-arg-ref args kw default) + (match (memq kw args) + ((_ val . _) val) + (_ default))) (define (enabled-for-level? level) (<= level optimization-level)) (let ((opts (let lp ((all-opts (tree-il-optimizations))) (match all-opts |