,(if (policy *lexenv* (zerop safety))
`(declare (ignore ,n-supplied))
`(%verify-arg-count ,n-supplied ,nargs))
- (%funcall ,fun ,@temps))))
+ (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)))
+ (%funcall ,fun ,@temps)))))
(optional-dispatch
(let* ((min (optional-dispatch-min-args fun))
(max (optional-dispatch-max-args fun))
(n-count (gensym)))
`(multiple-value-bind (,n-context ,n-count)
(%more-arg-context ,n-supplied ,max)
- (%funcall ,more ,@temps ,n-context ,n-count))))))
+ (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)))
+ (%funcall ,more ,@temps ,n-context ,n-count)))))))
(t
(%arg-count-error ,n-supplied)))))))))
(values))
;;; Attempt to convert a multiple-value call. The only interesting
-;;; case is a call to a function that Looks-Like-An-MV-Bind, has
+;;; case is a call to a function that LOOKS-LIKE-AN-MV-BIND, has
;;; exactly one reference and no XEP, and is called with one values
;;; continuation.
;;;
(let* ((home (node-home-lambda call))
(home-env (lambda-physenv home)))
+ (aver (not (eq home clambda)))
+
;; CLAMBDA belongs to HOME now.
(push clambda (lambda-lets home))
(setf (lambda-home clambda) home)
;; All of CLAMBDA's LETs belong to HOME now.
(let ((lets (lambda-lets clambda)))
(dolist (let lets)
- (setf (lambda-home let) home)
- (setf (lambda-physenv let) home-env))
+ (setf (lambda-home let) home)
+ (setf (lambda-physenv let) home-env))
(setf (lambda-lets home) (nconc lets (lambda-lets home))))
;; CLAMBDA no longer has an independent existence as an entity
;; which has LETs.
;; HOME no longer calls CLAMBDA, and owns all of CLAMBDA's old
;; DFO dependencies.
(setf (lambda-calls-or-closes home)
- (delete clambda
- (nunion (lambda-calls-or-closes clambda)
- (lambda-calls-or-closes home))))
+ (delete clambda
+ (nunion (lambda-calls-or-closes clambda)
+ (lambda-calls-or-closes home))))
;; CLAMBDA no longer has an independent existence as an entity
;; which calls things or has DFO dependencies.
(setf (lambda-calls-or-closes clambda) nil)
;; All of CLAMBDA's ENTRIES belong to HOME now.
(setf (lambda-entries home)
- (nconc (lambda-entries clambda)
- (lambda-entries home)))
+ (nconc (lambda-entries clambda)
+ (lambda-entries home)))
;; CLAMBDA no longer has an independent existence as an entity
;; with ENTRIES.
(setf (lambda-entries clambda) nil))
(reoptimize-continuation (node-cont call))
(values))
+;;; Are there any declarations in force to say CLAMBDA shouldn't be
+;;; LET converted?
+(defun declarations-suppress-let-conversion-p (clambda)
+ ;; From the user's point of view, LET-converting something that
+ ;; has a name is inlining it. (The user can't see what we're doing
+ ;; with anonymous things, and suppressing inlining
+ ;; for such things can easily give Python acute indigestion, so
+ ;; we don't.)
+ (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))
+ (not (eq (lambda-inlinep clambda) :inline))))))
+
;;; We also don't convert calls to named functions which appear in the
;;; initial component, delaying this until optimization. This
;;; minimizes the likelihood that we will LET-convert a function which
;;; may have references added due to later local inline expansion.
(defun ok-initial-convert-p (fun)
(not (and (leaf-has-source-name-p fun)
- (eq (component-kind (lambda-component fun))
- :initial))))
+ (or (declarations-suppress-let-conversion-p fun)
+ (eq (component-kind (lambda-component fun))
+ :initial)))))
;;; This function is called when there is some reason to believe that
;;; CLAMBDA might be converted into a LET. This is done after local
-;;; call analysis, and also when a reference is deleted. We only
-;;; convert to a let when the function is a normal local function, has
-;;; no XEP, and is referenced in exactly one local call. Conversion is
-;;; also inhibited if the only reference is in a block about to be
-;;; deleted. We return true if we converted.
-;;;
-;;; These rules may seem unnecessarily restrictive, since there are
-;;; some cases where we could do the return with a jump that don't
-;;; satisfy these requirements. The reason for doing things this way
-;;; is that it makes the concept of a LET much more useful at the
-;;; level of IR1 semantics. The :ASSIGNMENT function kind provides
-;;; another way to optimize calls to single-return/multiple call
-;;; functions.
-;;;
-;;; We don't attempt to convert calls to functions that have an XEP,
-;;; since we might be embarrassed later when we want to convert a
-;;; newly discovered local call. Also, see OK-INITIAL-CONVERT-P.
+;;; call analysis, and also when a reference is deleted. We return
+;;; true if we converted.
(defun maybe-let-convert (clambda)
(declare (type clambda clambda))
- (let ((refs (leaf-refs clambda)))
- (when (and refs
- (null (rest refs))
- (member (functional-kind clambda) '(nil :assignment))
- (not (functional-entry-fun clambda)))
- (let* ((ref-cont (node-cont (first refs)))
- (dest (continuation-dest ref-cont)))
- (when (and dest
- (basic-combination-p dest)
- (eq (basic-combination-fun dest) ref-cont)
- (eq (basic-combination-kind dest) :local)
- (not (block-delete-p (node-block dest)))
- (cond ((ok-initial-convert-p clambda) t)
- (t
- (reoptimize-continuation ref-cont)
- nil)))
- (unless (eq (functional-kind clambda) :assignment)
- (let-convert clambda dest))
- (reoptimize-call dest)
- (setf (functional-kind clambda)
- (if (mv-combination-p dest) :mv-let :let))))
- t)))
+ (unless (declarations-suppress-let-conversion-p clambda)
+ ;; We only convert to a LET when the function is a normal local
+ ;; function, has no XEP, and is referenced in exactly one local
+ ;; call. Conversion is also inhibited if the only reference is in
+ ;; a block about to be deleted.
+ ;;
+ ;; These rules limiting LET conversion may seem unnecessarily
+ ;; restrictive, since there are some cases where we could do the
+ ;; return with a jump that don't satisfy these requirements. The
+ ;; reason for doing things this way is that it makes the concept
+ ;; of a LET much more useful at the level of IR1 semantics. The
+ ;; :ASSIGNMENT function kind provides another way to optimize
+ ;; calls to single-return/multiple call functions.
+ ;;
+ ;; We don't attempt to convert calls to functions that have an
+ ;; XEP, since we might be embarrassed later when we want to
+ ;; convert a newly discovered local call. Also, see
+ ;; OK-INITIAL-CONVERT-P.
+ (let ((refs (leaf-refs clambda)))
+ (when (and refs
+ (null (rest refs))
+ (member (functional-kind clambda) '(nil :assignment))
+ (not (functional-entry-fun clambda)))
+ (let* ((ref (first refs))
+ (ref-cont (node-cont ref))
+ (dest (continuation-dest ref-cont)))
+ (when (and dest
+ (basic-combination-p dest)
+ (eq (basic-combination-fun dest) ref-cont)
+ (eq (basic-combination-kind dest) :local)
+ (not (block-delete-p (node-block dest)))
+ (cond ((ok-initial-convert-p clambda) t)
+ (t
+ (reoptimize-continuation ref-cont)
+ nil)))
+ (when (eq clambda (node-home-lambda dest))
+ (delete-lambda clambda)
+ (return-from maybe-let-convert nil))
+ (unless (eq (functional-kind clambda) :assignment)
+ (let-convert clambda dest))
+ (reoptimize-call dest)
+ (setf (functional-kind clambda)
+ (if (mv-combination-p dest) :mv-let :let))))
+ t))))
\f
;;;; tail local calls and assignments
(declare (type clambda clambda))
(when (and (not (functional-kind clambda))
(not (functional-entry-fun clambda)))
- (let ((non-tail nil)
- (call-fun nil))
+ (let ((outside-non-tail-call nil)
+ (outside-call nil))
(when (and (dolist (ref (leaf-refs clambda) t)
(let ((dest (continuation-dest (node-cont ref))))
(when (or (not dest)
(return nil))
(let ((home (node-home-lambda ref)))
(unless (eq home clambda)
- (when call-fun
+ (when outside-call
(return nil))
- (setq call-fun home))
+ (setq outside-call dest))
(unless (node-tail-p dest)
- (when (or non-tail (eq home clambda))
+ (when (or outside-non-tail-call (eq home clambda))
(return nil))
- (setq non-tail dest)))))
+ (setq outside-non-tail-call dest)))))
(ok-initial-convert-p clambda))
- (setf (functional-kind clambda) :assignment)
- (let-convert clambda
- (or non-tail
- (continuation-dest
- (node-cont (first (leaf-refs clambda))))))
- (when non-tail
- (reoptimize-call non-tail))
- t))))
+ (cond (outside-call (setf (functional-kind clambda) :assignment)
+ (let-convert clambda outside-call)
+ (when outside-non-tail-call
+ (reoptimize-call outside-non-tail-call))
+ t)
+ (t (delete-lambda clambda)
+ nil))))))