diff options
| author | Kaz Kylheku <kaz@kylheku.com> | 2021-03-27 13:28:34 -0700 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2021-03-27 13:28:34 -0700 |
| commit | a7880f77c8732c589c410b3294bd09abe6419f1f (patch) | |
| tree | bbe6ebb172b58a2a569f86821434c9754e98dc92 | |
| parent | f13a86a82c7e526cb02276c361d9844c851740ac (diff) | |
| download | txr-a7880f77c8732c589c410b3294bd09abe6419f1f.tar.gz txr-a7880f77c8732c589c410b3294bd09abe6419f1f.tar.bz2 txr-a7880f77c8732c589c410b3294bd09abe6419f1f.zip | |
compiler: fix: careless constant folding of call.
* share/txr/stdlib/compiler.tl (compiler comp-apply-call): The
conditions for constant-folding a call expressions are too
weak. The first argument could be a quoted symbol, which is a
constant expression, and so we end up wrongly evaluating
an expression like (call 'print '3) at compile time.
We can constant-fold if the first expression evaluates to a
symbol, which names a constant-foldable function, or else
if it evaluates to something which is not a bindable symbol.
| -rw-r--r-- | share/txr/stdlib/compiler.tl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/share/txr/stdlib/compiler.tl b/share/txr/stdlib/compiler.tl index 65202e9e..21721ad6 100644 --- a/share/txr/stdlib/compiler.tl +++ b/share/txr/stdlib/compiler.tl @@ -1362,7 +1362,10 @@ (cond ((and (plusp olev) (eq sym 'call) - [all args constantp]) + [all args constantp] + (let ((op (eval (car args)))) + (or [%const-foldable% op] + (not (bindable op))))) me.(compile oreg env (eval form))) (t (tree-case (car args) ((op arg . more) |