(setf (car args) nil)))
(values))
-(defun handle-nested-dynamic-extent-lvars (lvar)
- (let ((uses (lvar-uses lvar)))
- ;; Stack analysis wants DX value generators to end their
- ;; blocks. Uses of mupltiple used LVARs already end their blocks,
- ;; so we just need to process used-once LVARs.
- ;;
- ;; FIXME: Is this true? I cannot trigger any bad behaviour if I nuke this
- ;; form, and the only assumption regarding block ends I see in in stack
- ;; analysis is the one made by MAP-BLOCK-NLXES, which assumes that nodes
- ;; with cleanups in their lexenv end their blocks. If this one is
- ;; necessary, we should explain why in more detail. --NS 2008-07-19
- (when (node-p uses)
- (node-ends-block uses))
- ;; If this LVAR's USE is good for DX, it is either a CAST, or it
- ;; must be a regular combination whose arguments are potentially DX as well.
- (flet ((recurse (use)
- (etypecase use
- (cast
- (handle-nested-dynamic-extent-lvars (cast-value use)))
- (combination
- (loop for arg in (combination-args use)
- when (lvar-good-for-dx-p arg)
- append (handle-nested-dynamic-extent-lvars arg))))))
- (cons lvar
- (if (listp uses)
- (loop for use in uses
- when (use-good-for-dx-p use)
- nconc (recurse use))
- (when (use-good-for-dx-p uses)
- (recurse uses)))))))
-
(defun recognize-dynamic-extent-lvars (call fun)
(declare (type combination call) (type clambda fun))
(loop for arg in (basic-combination-args call)
- and var in (lambda-vars fun)
- when (and arg (lambda-var-dynamic-extent var)
- (not (lvar-dynamic-extent arg)))
- append (handle-nested-dynamic-extent-lvars arg) into dx-lvars
+ for var in (lambda-vars fun)
+ for dx = (lambda-var-dynamic-extent var)
+ when (and dx arg (not (lvar-dynamic-extent arg)))
+ append (handle-nested-dynamic-extent-lvars dx arg) into dx-lvars
finally (when dx-lvars
;; Stack analysis requires that the CALL ends the block, so
;; that MAP-BLOCK-NLXES sees the cleanup we insert here.
(make-lexenv :default (node-lexenv call)
:cleanup cleanup))
(push entry (lambda-entries (node-home-lambda entry)))
- (dolist (lvar dx-lvars)
- (setf (lvar-dynamic-extent lvar) cleanup)))))
+ (dolist (cell dx-lvars)
+ (setf (lvar-dynamic-extent (cdr cell)) cleanup)))))
(values))
;;; This function handles merging the tail sets if CALL is potentially
do (entries `((eql ,n-supplied ,n)
(%funcall ,(force ep) ,@(subseq temps 0 n)))))
`(lambda (,n-supplied ,@temps)
- ;; FIXME: Make sure that INDEX type distinguishes between
- ;; target and host. (Probably just make the SB!XC:DEFTYPE
- ;; different from CL:DEFTYPE.)
(declare (type index ,n-supplied))
(cond
,@(if more (butlast (entries)) (entries))
;; KLUDGE: (NOT (< ...)) instead of >= avoids one round of
;; deftransforms and lambda-conversion.
`((,(if (zerop min) t `(not (< ,n-supplied ,max)))
- ,(let ((n-context (gensym))
- (n-count (gensym)))
+ ,(with-unique-names (n-context n-count)
`(multiple-value-bind (,n-context ,n-count)
(%more-arg-context ,n-supplied ,max)
(locally
(with-ir1-environment-from-node (lambda-bind (main-entry fun))
(let ((res (ir1-convert-lambda (make-xep-lambda-expression fun)
:debug-name (debug-name
- 'xep (leaf-debug-name fun)))))
+ 'xep (leaf-debug-name fun))
+ :system-lambda t)))
(setf (functional-kind res) :external
(leaf-ever-used res) t
(functional-entry-fun res) fun
(declare (type ref ref) (type mv-combination call) (type functional fun))
(when (and (looks-like-an-mv-bind fun)
(singleton-p (leaf-refs fun))
- (singleton-p (basic-combination-args call)))
+ (singleton-p (basic-combination-args call))
+ (not (functional-entry-fun fun)))
(let* ((*current-component* (node-component ref))
(ep (optional-dispatch-entry-point-fun
fun (optional-dispatch-max-args fun))))
(when (null (leaf-refs ep))
(aver (= (optional-dispatch-min-args fun) 0))
- (aver (not (functional-entry-fun fun)))
(setf (basic-combination-kind call) :local)
(sset-adjoin ep (lambda-calls-or-closes (node-home-lambda call)))
(merge-tail-sets call ep)
(%funcall ,entry ,@args))
:debug-name (debug-name 'hairy-function-entry
(lvar-fun-debug-name
- (basic-combination-fun call)))))))
+ (basic-combination-fun call)))
+ :system-lambda t))))
(convert-call ref call new-fun)
(dolist (ref (leaf-refs entry))
(convert-call-if-possible ref (lvar-dest (node-lvar ref))))))
(setf (lambda-physenv clambda) home-physenv)
(when physenv
+ (unless home-physenv
+ (setf home-physenv (get-lambda-physenv home)))
(setf (physenv-nlx-info home-physenv)
(nconc (physenv-nlx-info physenv)
(physenv-nlx-info home-physenv))))
projects / sbcl.git / blobdiff