X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Flocall.lisp;h=b6d52c2e9c986bd2ea210a725c387429d2609ff9;hb=edb7acf8d242c0398ec33924e21c85dc54bc768d;hp=7cb638b55c2eb48589ad4f1d0b96fce1c66269a1;hpb=e3113504fca73ebd1b992930315386d9d3ae5d18;p=sbcl.git diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp index 7cb638b..b6d52c2 100644 --- a/src/compiler/locall.lisp +++ b/src/compiler/locall.lisp @@ -43,41 +43,11 @@ (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) for var in (lambda-vars fun) - for dx = (lambda-var-dynamic-extent var) + for dx = (leaf-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 @@ -95,8 +65,8 @@ (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 @@ -210,9 +180,6 @@ 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)) @@ -220,8 +187,7 @@ ;; 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 @@ -243,25 +209,29 @@ (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 @@ -506,13 +476,13 @@ (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) @@ -590,14 +560,15 @@ ;;; function that rearranges the arguments and calls the entry point. ;;; We analyze the new function and the entry point immediately so ;;; that everything gets converted during the single pass. -(defun convert-hairy-fun-entry (ref call entry vars ignores args) +(defun convert-hairy-fun-entry (ref call entry vars ignores args indef) (declare (list vars ignores args) (type ref ref) (type combination call) (type clambda entry)) (let ((new-fun (with-ir1-environment-from-node call (ir1-convert-lambda `(lambda ,vars - (declare (ignorable ,@ignores)) + (declare (ignorable ,@ignores) + (indefinite-extent ,@indef)) (%funcall ,entry ,@args)) :debug-name (debug-name 'hairy-function-entry (lvar-fun-debug-name @@ -728,7 +699,8 @@ (convert-hairy-fun-entry ref call (optional-dispatch-main-entry fun) (append temps more-temps) - (ignores) (call-args))))) + (ignores) (call-args) + more-temps)))) (values))