(setf (car args) nil)))
(values))
-(defun handle-nested-dynamic-extent-lvars (lvar)
+(defun handle-nested-dynamic-extent-lvars (dx 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.
+ ;; DX value generators must end their blocks: see UPDATE-UVL-LIVE-SETS.
+ ;; Uses of mupltiple-use LVARs already end their blocks, so we just need
+ ;; to process uses of single-use LVARs.
(when (node-p uses)
(node-ends-block uses))
- ;; If this LVAR's USE is good for DX, it must be a regular
- ;; combination, and its arguments are potentially DX as well.
+ ;; 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)
- (loop for arg in (combination-args use)
- append (handle-nested-dynamic-extent-lvars arg))))
+ (etypecase use
+ (cast
+ (handle-nested-dynamic-extent-lvars dx (cast-value use)))
+ (combination
+ (loop for arg in (combination-args use)
+ ;; deleted args show up as NIL here
+ when (and arg (lvar-good-for-dx-p arg dx))
+ append (handle-nested-dynamic-extent-lvars dx arg)))
+ (ref
+ (let* ((other (trivial-lambda-var-ref-lvar use)))
+ (unless (eq other lvar)
+ (handle-nested-dynamic-extent-lvars dx other)))))))
(cons lvar
(if (listp uses)
(loop for use in uses
- when (use-good-for-dx-p use)
+ when (use-good-for-dx-p use dx)
nconc (recurse use))
- (when (use-good-for-dx-p uses)
+ (when (use-good-for-dx-p uses dx)
(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
- (binding* ((before-ctran (node-prev call))
- (nil (ensure-block-start before-ctran))
- (block (ctran-block before-ctran))
- (new-call-ctran (make-ctran :kind :inside-block
- :next call
- :block block))
- (entry (with-ir1-environment-from-node call
- (make-entry :prev before-ctran
- :next new-call-ctran)))
- (cleanup (make-cleanup :kind :dynamic-extent
- :mess-up entry
- :info dx-lvars)))
- (setf (node-prev call) new-call-ctran)
- (setf (ctran-next before-ctran) entry)
- (setf (ctran-use new-call-ctran) entry)
+ ;; Stack analysis requires that the CALL ends the block, so
+ ;; that MAP-BLOCK-NLXES sees the cleanup we insert here.
+ (node-ends-block call)
+ (let* ((entry (with-ir1-environment-from-node call
+ (make-entry)))
+ (cleanup (make-cleanup :kind :dynamic-extent
+ :mess-up entry
+ :info dx-lvars)))
(setf (entry-cleanup entry) cleanup)
+ (insert-node-before call entry)
(setf (node-lexenv call)
(make-lexenv :default (node-lexenv call)
:cleanup cleanup))
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 (ignorable ,@ignores))
(%funcall ,entry ,@args))
:debug-name (debug-name 'hairy-function-entry
- (lvar-fun-name
- (basic-combination-fun call)))))))
+ (lvar-fun-debug-name
+ (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