0.pre8.92:

[sbcl.git] / src / compiler / physenvanal.lisp

diff --git a/src/compiler/physenvanal.lisp b/src/compiler/physenvanal.lisp
index 120133f..8b4bb25 100644 (file)
--- a/src/compiler/physenvanal.lisp
+++ b/src/compiler/physenvanal.lisp
@@ -279,7 +279,7 @@
 ;;;    the component tail.
 ;;; -- Close over the NLX-INFO in the exit environment.
 ;;; -- If the exit is from an :ESCAPE function, then substitute a
-;;;    constant reference to NLX-Info structure for the escape
+;;;    constant reference to NLX-INFO structure for the escape
 ;;;    function reference. This will cause the escape function to
 ;;;    be deleted (although not removed from the DFO.)  The escape
 ;;;    function is no longer needed, and we don't want to emit code
@@ -402,8 +402,8 @@
              (emit-cleanups block1 block2)))))))
   (values))
 
-;;; Mark optimizable tail-recursive uses of function result continuations with
-;;; the corresponding TAIL-SET. 
+;;; Mark optimizable tail-recursive uses of function result
+;;; continuations with the corresponding TAIL-SET.
 (defun tail-annotate (component)
   (declare (type component component))
   (dolist (fun (component-lambdas component))
@@ -419,9 +419,7 @@
       (when ret
        (let ((result (return-result ret)))
          (do-uses (use result)
-           (when (and (policy use
-                              (or (> space debug)
-                                  (> speed debug)))
+           (when (and (policy use merge-tail-calls)
                       (immediately-used-p result use)
                       (or (not (eq (node-derived-type use) *empty-type*))
                           (not (basic-combination-p use))