(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)))
- collect arg into dx-lvars
- and do (let ((use (lvar-uses arg)))
- ;; 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.
- (when (node-p use)
- (node-ends-block use)))
+ 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))
(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
(declare (type functional fun))
(aver (null (functional-entry-fun fun)))
(with-ir1-environment-from-node (lambda-bind (main-entry fun))
- (let ((res (ir1-convert-lambda (make-xep-lambda-expression fun)
+ (let ((xep (ir1-convert-lambda (make-xep-lambda-expression fun)
:debug-name (debug-name
- 'xep (leaf-debug-name fun)))))
- (setf (functional-kind res) :external
- (leaf-ever-used res) t
- (functional-entry-fun res) fun
- (functional-entry-fun fun) res
+ 'xep (leaf-debug-name fun))
+ :system-lambda t)))
+ (setf (functional-kind xep) :external
+ (leaf-ever-used xep) t
+ (functional-entry-fun xep) fun
+ (functional-entry-fun fun) xep
(component-reanalyze *current-component*) t)
(reoptimize-component *current-component* :maybe)
- (etypecase fun
- (clambda
- (locall-analyze-fun-1 fun))
- (optional-dispatch
- (dolist (ep (optional-dispatch-entry-points fun))
- (locall-analyze-fun-1 (force ep)))
- (when (optional-dispatch-more-entry fun)
- (locall-analyze-fun-1 (optional-dispatch-more-entry fun)))))
- res)))
+ (locall-analyze-xep-entry-point fun)
+ xep)))
+
+(defun locall-analyze-xep-entry-point (fun)
+ (declare (type functional fun))
+ (etypecase fun
+ (clambda
+ (locall-analyze-fun-1 fun))
+ (optional-dispatch
+ (dolist (ep (optional-dispatch-entry-points fun))
+ (locall-analyze-fun-1 (force ep)))
+ (when (optional-dispatch-more-entry fun)
+ (locall-analyze-fun-1 (optional-dispatch-more-entry fun))))))
;;; Notice a REF that is not in a local-call context. If the REF is
;;; already to an XEP, then do nothing, otherwise change it to the
(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)
(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))))