X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Flocall.lisp;h=ae4ad080dba81e34272ceb09d17fe891dd6178ad;hb=f294da03824843f07d781e655d5a5e70c2c4851e;hp=620d28540e42361de6b3b7f79f28b3811fb5dc97;hpb=e049902f5e7c30501d2dbb7a41d058a0c717fc1f;p=sbcl.git

diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp
index 620d285..ae4ad08 100644
--- a/src/compiler/locall.lisp
+++ b/src/compiler/locall.lisp
@@ -134,21 +134,11 @@
 	   (temps (make-gensym-list (length (lambda-vars fun)))))
        `(lambda (,n-supplied ,@temps)
 	  (declare (type index ,n-supplied))
-	  ,(if (policy *lexenv* (zerop safety))
+	  ,(if (policy *lexenv* (zerop verify-arg-count))
 	       `(declare (ignore ,n-supplied))
 	       `(%verify-arg-count ,n-supplied ,nargs))
 	  (locally
-	    ;; KLUDGE: The intent here is to enable tail recursion
-	    ;; optimization, since leaving frames for wrapper
-	    ;; functions like this on the stack is actually more
-	    ;; annoying than helpful for debugging. Unfortunately
-	    ;; trying to express this by messing with the
-	    ;; ANSI-standard declarations is a little awkward, since
-	    ;; no matter how we do it we'll tend to have side-effects
-	    ;; on things like SPEED-vs.-SAFETY comparisons. Perhaps
-	    ;; it'd be better to define a new SB-EXT:TAIL-RECURSIVELY
-	    ;; declaration and use that? -- WHN 2002-07-08
-	    (declare (optimize (speed 2) (debug 1)))
+	    (declare (optimize (merge-tail-calls 3)))
 	    (%funcall ,fun ,@temps)))))
     (optional-dispatch
      (let* ((min (optional-dispatch-min-args fun))
@@ -176,11 +166,7 @@
 		       `(multiple-value-bind (,n-context ,n-count)
 			    (%more-arg-context ,n-supplied ,max)
 			  (locally
-			    ;; KLUDGE: As above, we're trying to
-			    ;; enable tail recursion optimization and
-			    ;; any other effects of this declaration
-			    ;; are accidental. -- WHN 2002-07-08
-			    (declare (optimize (speed 2) (debug 1)))
+			    (declare (optimize (merge-tail-calls 3)))
 			    (%funcall ,more ,@temps ,n-context ,n-count)))))))
 	     (t
 	      (%arg-count-error ,n-supplied)))))))))
@@ -547,8 +533,8 @@
 	 (with-ir1-environment-from-node call
 	   (ir1-convert-lambda
 	    `(lambda ,vars
-	       (declare (ignorable . ,ignores))
-	       (%funcall ,entry . ,args))
+	       (declare (ignorable ,@ignores))
+	       (%funcall ,entry ,@args))
 	    :debug-name (debug-namify "hairy function entry ~S"
 				      (continuation-fun-name
 				       (basic-combination-fun call)))))))
@@ -958,12 +944,21 @@
     (cond ((not return))
 	  ((or next-block call-return)
 	   (unless (block-delete-p (node-block return))
+             (when (and (node-tail-p call)
+                        call-return
+                        (not (eq (node-cont call)
+                                 (return-result call-return))))
+               ;; We do not care to give a meaningful continuation to
+               ;; a tail combination, but here we need it.
+               (delete-continuation-use call)
+               (add-continuation-use call (return-result call-return)))
 	     (move-return-uses fun call
 			       (or next-block (node-block call-return)))))
 	  (t
 	   (aver (node-tail-p call))
 	   (setf (lambda-return call-fun) return)
-	   (setf (return-lambda return) call-fun))))
+	   (setf (return-lambda return) call-fun)
+           (setf (lambda-return fun) nil))))
   (move-let-call-cont fun)
   (values))
 
@@ -1001,10 +996,11 @@
   (when (leaf-has-source-name-p clambda)
     ;; ANSI requires that explicit NOTINLINE be respected.
     (or (eq (lambda-inlinep clambda) :notinline)
-	;; If (> DEBUG SPEED) we can guess that inlining generally
-	;; won't be appreciated, but if the user specifically requests
-	;; inlining, that takes precedence over our general guess.
-	(and (policy clambda (> debug speed))
+	;; If (= LET-CONVERTION 0) we can guess that inlining
+	;; generally won't be appreciated, but if the user
+	;; specifically requests inlining, that takes precedence over
+	;; our general guess.
+	(and (policy clambda (= let-convertion 0))
 	     (not (eq (lambda-inlinep clambda) :inline))))))
 
 ;;; We also don't convert calls to named functions which appear in the