X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Flocall.lisp;h=7cb638b55c2eb48589ad4f1d0b96fce1c66269a1;hb=d3705ad6676c19417b69cf38dd3667f6b3c3d2ef;hp=ee3b1e34d215757d463c25622a55d1ce3c3412b8;hpb=1840d888d2ef13fe0ea5aaa06f1fef3300da682b;p=sbcl.git diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp index ee3b1e3..7cb638b 100644 --- a/src/compiler/locall.lisp +++ b/src/compiler/locall.lisp @@ -43,38 +43,54 @@ (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 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) - 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)) @@ -191,7 +207,7 @@ (optional-dispatch-entry-point-fun fun 0) (loop for ep in (optional-dispatch-entry-points fun) and n from min - do (entries `((= ,n-supplied ,n) + 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 @@ -201,7 +217,9 @@ (cond ,@(if more (butlast (entries)) (entries)) ,@(when more - `((,(if (zerop min) t `(>= ,n-supplied ,max)) + ;; 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))) `(multiple-value-bind (,n-context ,n-count) @@ -227,7 +245,8 @@ (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 @@ -355,8 +374,7 @@ (loop (let ((did-something nil)) (dolist (clambda clambdas) - (let* ((component (lambda-component clambda)) - (*all-components* (list component))) + (let ((component (lambda-component clambda))) ;; The original CMU CL code seemed to implicitly assume that ;; COMPONENT is the only one here. Let's make that explicit. (aver (= 1 (length (functional-components clambda)))) @@ -582,8 +600,9 @@ (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)))))) @@ -843,6 +862,8 @@ (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))))