X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fphysenvanal.lisp;h=8b4bb253b69dfdc3778a91ae4ca3da0757ce9bce;hb=50f728671defadb8f7b1e8691c984cb0e6aba17c;hp=ca8d927b7033739449c1a27e91f92bf86b856584;hpb=13fb43363e194ac787e287f447856165d6bb064d;p=sbcl.git

diff --git a/src/compiler/physenvanal.lisp b/src/compiler/physenvanal.lisp
index ca8d927..8b4bb25 100644
--- 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
@@ -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))