compiler: TCO: redundant code handling optionals.

* stdlib/compiler.tl (compiler comp-tail-call): Throw away
the code generated by lambda-apply-transform for doing
defaulting of optionals. The function already contains code
to do that, right at the top where the tail call jumps.
defaulting optionals twice is not just a waste of time, but
can evaluate twice the expressions which provide the default
values.

1 files changed, 5 insertions, 8 deletions

diff --git a/stdlib/compiler.tl b/stdlib/compiler.tl
index fc0e9140..37c5df56 100644
--- a/stdlib/compiler.tl
+++ b/stdlib/compiler.tl
@@ -1605,17 +1605,14 @@
              (args (butlastn 0 (cdr form)))
              (dot-arg (nthlast 0 form))
              (lat (sys:lambda-apply-transform lamb args dot-arg nil)))
-        (match (@(or alet let) @temps (let* @sets . @code)) lat
+        (match (@(or alet let) @temps (let* @sets . @nil)) lat
           (let* ((xsets (mapcar (tb ((sym val))
                                    ^(sys:setq-in-env ,sym ,val ,tenv))
                                 sets))
-                 (sfrag me.(comp-let oreg env ^(let ,temps ,*xsets)))
-                 (cfrag me.(compile oreg tenv (expand ^(progn ,*code)))))
-            (set me.tjmp-occurs t)
-            (new (frag cfrag.oreg
-                       (append sfrag.code cfrag.code ^((tjmp ,tfn.label)))
-                       (uni sfrag.fvars cfrag.fvars)
-                       (uni sfrag.ffuns cfrag.ffuns)))))))))
+                 (sfrag me.(comp-let oreg env ^(let ,temps ,*xsets))))
+            (set me.tjmp-occurs t
+                 sfrag.code (append sfrag.code ^((tjmp ,tfn.label))))
+            sfrag))))))
 
 (defmeth compiler comp-for (me oreg env form)
   (mac-param-bind form (t inits (: (test nil test-p) . rets) incs . body) form