(let* ((other (trivial-lambda-var-ref-lvar use)))
(unless (eq other lvar)
(handle-nested-dynamic-extent-lvars dx other)))))))
- (cons lvar
+ (cons (cons dx lvar)
(if (listp uses)
(loop for use in uses
when (use-good-for-dx-p use dx)
(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))
+;;; Called after a transform has been applied to CALL: if the call has a DX
+;;; result, propagate the DXness to the new functional as well.
+;;;
+;;; This is needed in case an earlier call to LOCALL-ANALYZE-COMPONENT
+;;; collected DX information before the transformation, in which case a later
+;;; call to LOCALL-ANALYZE-COMPONENT would not pick up the DX declaration
+;;; again, since the call has already been converted. (In other words, work
+;;; around the fact that optimization iterates, and locall analysis may have
+;;; already run by the time we are able to transform something.)
+(defun maybe-propagate-dynamic-extent (call fun)
+ (when (lambda-p fun)
+ (let* ((lvar (combination-lvar call))
+ (cleanup (or (and lvar (lvar-dynamic-extent lvar))
+ (return-from maybe-propagate-dynamic-extent)))
+ (ret (lambda-return fun))
+ (res (if ret
+ (return-result ret)
+ (return-from maybe-propagate-dynamic-extent)))
+ (dx (car (rassoc lvar (cleanup-info cleanup) :test #'eq)))
+ (new-dx-lvars (if (and dx res)
+ (handle-nested-dynamic-extent-lvars dx res)
+ (return-from maybe-propagate-dynamic-extent))))
+ (when new-dx-lvars
+ ;; This builds on what RECOGNIZE-DYNAMIC-EXTENT-LVARS does above.
+ (aver (eq call (block-last (node-block call))))
+ (dolist (cell new-dx-lvars)
+ (let ((lvar (cdr cell)))
+ (aver (not (lvar-dynamic-extent lvar)))
+ (push cell (cleanup-info cleanup))
+ (setf (lvar-dynamic-extent (cdr cell)) cleanup)))))))
+
;;; This function handles merging the tail sets if CALL is potentially
;;; tail-recursive, and is a call to a function with a different
;;; TAIL-SET than CALL's FUN. This must be called whenever we alter
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