(setf (car args) nil)))
(values))
-(defun handle-nested-dynamic-extent-lvars (dx lvar)
- (let ((uses (lvar-uses lvar)))
- ;; 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 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 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 (cons dx lvar)
- (if (listp uses)
- (loop for use in uses
- when (use-good-for-dx-p use dx)
- nconc (recurse use))
- (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)
(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))
:system-lambda t)))
- (setf (functional-kind res) :external
- (leaf-ever-used res) t
- (functional-entry-fun res) fun
- (functional-entry-fun fun) res
+ (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)