X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1opt.lisp;h=cb198bdbf15f7dd722b6916f83e3b466f2a3e81f;hb=6053e7f804b430144bb09e2d107ad4ab3fb97db4;hp=8768bdb402de8d57b4aba4acc89849a005700f2a;hpb=416152f084604094445a758ff399871132dff2bd;p=sbcl.git diff --git a/src/compiler/ir1opt.lisp b/src/compiler/ir1opt.lisp index 8768bdb..cb198bd 100644 --- a/src/compiler/ir1opt.lisp +++ b/src/compiler/ir1opt.lisp @@ -18,201 +18,193 @@ ;;;; interface for obtaining results of constant folding -;;; Return true if the sole use of Cont is a reference to a constant leaf. -(declaim (ftype (function (continuation) boolean) constant-continuation-p)) -(defun constant-continuation-p (cont) - (let ((use (continuation-use cont))) - (and (ref-p use) - (constant-p (ref-leaf use))))) - -;;; Return the constant value for a continuation whose only use is a -;;; constant node. -(declaim (ftype (function (continuation) t) continuation-value)) -(defun continuation-value (cont) - (aver (constant-continuation-p cont)) - (constant-value (ref-leaf (continuation-use cont)))) +;;; Return true for an LVAR whose sole use is a reference to a +;;; constant leaf. +(defun constant-lvar-p (thing) + (and (lvar-p thing) + (let ((use (principal-lvar-use thing))) + (and (ref-p use) (constant-p (ref-leaf use)))))) + +;;; Return the constant value for an LVAR whose only use is a constant +;;; node. +(declaim (ftype (function (lvar) t) lvar-value)) +(defun lvar-value (lvar) + (let ((use (principal-lvar-use lvar))) + (constant-value (ref-leaf use)))) ;;;; interface for obtaining results of type inference -;;; Return a (possibly values) type that describes what we have proven -;;; about the type of Cont without taking any type assertions into -;;; consideration. This is just the union of the NODE-DERIVED-TYPE of -;;; all the uses. Most often people use CONTINUATION-DERIVED-TYPE or -;;; CONTINUATION-TYPE instead of using this function directly. -(defun continuation-proven-type (cont) - (declare (type continuation cont)) - (ecase (continuation-kind cont) - ((:block-start :deleted-block-start) - (let ((uses (block-start-uses (continuation-block cont)))) - (if uses - (do ((res (node-derived-type (first uses)) - (values-type-union (node-derived-type (first current)) - res)) - (current (rest uses) (rest current))) - ((null current) res)) - *empty-type*))) - (:inside-block - (node-derived-type (continuation-use cont))))) - -;;; Our best guess for the type of this continuation's value. Note -;;; that this may be Values or Function type, which cannot be passed -;;; as an argument to the normal type operations. See -;;; Continuation-Type. This may be called on deleted continuations, -;;; always returning *. +;;; Our best guess for the type of this lvar's value. Note that this +;;; may be VALUES or FUNCTION type, which cannot be passed as an +;;; argument to the normal type operations. See LVAR-TYPE. ;;; -;;; What we do is call CONTINUATION-PROVEN-TYPE and check whether the -;;; result is a subtype of the assertion. If so, return the proven -;;; type and set TYPE-CHECK to nil. Otherwise, return the intersection -;;; of the asserted and proven types, and set TYPE-CHECK T. If -;;; TYPE-CHECK already has a non-null value, then preserve it. Only in -;;; the somewhat unusual circumstance of a newly discovered assertion -;;; will we change TYPE-CHECK from NIL to T. -;;; -;;; The result value is cached in the CONTINUATION-%DERIVED-TYPE slot. -;;; If the slot is true, just return that value, otherwise recompute -;;; and stash the value there. -#!-sb-fluid (declaim (inline continuation-derived-type)) -(defun continuation-derived-type (cont) - (declare (type continuation cont)) - (or (continuation-%derived-type cont) - (%continuation-derived-type cont))) -(defun %continuation-derived-type (cont) - (declare (type continuation cont)) - (let ((proven (continuation-proven-type cont)) - (asserted (continuation-asserted-type cont))) - (cond ((values-subtypep proven asserted) - (setf (continuation-%type-check cont) nil) - (setf (continuation-%derived-type cont) proven)) - (t - (unless (or (continuation-%type-check cont) - (not (continuation-dest cont)) - (eq asserted *universal-type*)) - (setf (continuation-%type-check cont) t)) - - (setf (continuation-%derived-type cont) - (values-type-intersection asserted proven)))))) - -;;; Call CONTINUATION-DERIVED-TYPE to make sure the slot is up to -;;; date, then return it. -#!-sb-fluid (declaim (inline continuation-type-check)) -(defun continuation-type-check (cont) - (declare (type continuation cont)) - (continuation-derived-type cont) - (continuation-%type-check cont)) - -;;; Return the derived type for CONT's first value. This is guaranteed +;;; The result value is cached in the LVAR-%DERIVED-TYPE slot. If the +;;; slot is true, just return that value, otherwise recompute and +;;; stash the value there. +#!-sb-fluid (declaim (inline lvar-derived-type)) +(defun lvar-derived-type (lvar) + (declare (type lvar lvar)) + (or (lvar-%derived-type lvar) + (setf (lvar-%derived-type lvar) + (%lvar-derived-type lvar)))) +(defun %lvar-derived-type (lvar) + (declare (type lvar lvar)) + (let ((uses (lvar-uses lvar))) + (cond ((null uses) *empty-type*) + ((listp uses) + (do ((res (node-derived-type (first uses)) + (values-type-union (node-derived-type (first current)) + res)) + (current (rest uses) (rest current))) + ((null current) res))) + (t + (node-derived-type (lvar-uses lvar)))))) + +;;; Return the derived type for LVAR's first value. This is guaranteed ;;; not to be a VALUES or FUNCTION type. -(declaim (ftype (function (continuation) ctype) continuation-type)) -(defun continuation-type (cont) - (single-value-type (continuation-derived-type cont))) +(declaim (ftype (sfunction (lvar) ctype) lvar-type)) +(defun lvar-type (lvar) + (single-value-type (lvar-derived-type lvar))) + +;;; If LVAR is an argument of a function, return a type which the +;;; function checks LVAR for. +#!-sb-fluid (declaim (inline lvar-externally-checkable-type)) +(defun lvar-externally-checkable-type (lvar) + (or (lvar-%externally-checkable-type lvar) + (%lvar-%externally-checkable-type lvar))) +(defun %lvar-%externally-checkable-type (lvar) + (declare (type lvar lvar)) + (let ((dest (lvar-dest lvar))) + (if (not (and dest (combination-p dest))) + ;; TODO: MV-COMBINATION + (setf (lvar-%externally-checkable-type lvar) *wild-type*) + (let* ((fun (combination-fun dest)) + (args (combination-args dest)) + (fun-type (lvar-type fun))) + (setf (lvar-%externally-checkable-type fun) *wild-type*) + (if (or (not (call-full-like-p dest)) + (not (fun-type-p fun-type)) + ;; FUN-TYPE might be (AND FUNCTION (SATISFIES ...)). + (fun-type-wild-args fun-type)) + (dolist (arg args) + (when arg + (setf (lvar-%externally-checkable-type arg) + *wild-type*))) + (map-combination-args-and-types + (lambda (arg type) + (setf (lvar-%externally-checkable-type arg) + (acond ((lvar-%externally-checkable-type arg) + (values-type-intersection + it (coerce-to-values type))) + (t (coerce-to-values type))))) + dest))))) + (lvar-%externally-checkable-type lvar)) +#!-sb-fluid(declaim (inline flush-lvar-externally-checkable-type)) +(defun flush-lvar-externally-checkable-type (lvar) + (declare (type lvar lvar)) + (setf (lvar-%externally-checkable-type lvar) nil)) ;;;; interface routines used by optimizers ;;; This function is called by optimizers to indicate that something -;;; interesting has happened to the value of Cont. Optimizers must +;;; interesting has happened to the value of LVAR. Optimizers must ;;; make sure that they don't call for reoptimization when nothing has ;;; happened, since optimization will fail to terminate. ;;; -;;; We clear any cached type for the continuation and set the -;;; reoptimize flags on everything in sight, unless the continuation -;;; is deleted (in which case we do nothing.) -;;; -;;; Since this can get called during IR1 conversion, we have to be -;;; careful not to fly into space when the Dest's Prev is missing. -(defun reoptimize-continuation (cont) - (declare (type continuation cont)) - (unless (member (continuation-kind cont) '(:deleted :unused)) - (setf (continuation-%derived-type cont) nil) - (let ((dest (continuation-dest cont))) +;;; We clear any cached type for the lvar and set the reoptimize flags +;;; on everything in sight. +(defun reoptimize-lvar (lvar) + (declare (type (or lvar null) lvar)) + (when lvar + (setf (lvar-%derived-type lvar) nil) + (let ((dest (lvar-dest lvar))) (when dest - (setf (continuation-reoptimize cont) t) - (setf (node-reoptimize dest) t) - (let ((prev (node-prev dest))) - (when prev - (let* ((block (continuation-block prev)) - (component (block-component block))) - (when (typep dest 'cif) - (setf (block-test-modified block) t)) - (setf (block-reoptimize block) t) - (setf (component-reoptimize component) t)))))) - (do-uses (node cont) + (setf (lvar-reoptimize lvar) t) + (setf (node-reoptimize dest) t) + (binding* (;; Since this may be called during IR1 conversion, + ;; PREV may be missing. + (prev (node-prev dest) :exit-if-null) + (block (ctran-block prev)) + (component (block-component block))) + (when (typep dest 'cif) + (setf (block-test-modified block) t)) + (setf (block-reoptimize block) t) + (setf (component-reoptimize component) t)))) + (do-uses (node lvar) (setf (block-type-check (node-block node)) t))) (values)) -;;; Annotate Node to indicate that its result has been proven to be -;;; typep to RType. After IR1 conversion has happened, this is the +(defun reoptimize-lvar-uses (lvar) + (declare (type lvar lvar)) + (do-uses (use lvar) + (setf (node-reoptimize use) t) + (setf (block-reoptimize (node-block use)) t) + (setf (component-reoptimize (node-component use)) t))) + +;;; Annotate NODE to indicate that its result has been proven to be +;;; TYPEP to RTYPE. After IR1 conversion has happened, this is the ;;; only correct way to supply information discovered about a node's -;;; type. If you screw with the Node-Derived-Type directly, then +;;; type. If you screw with the NODE-DERIVED-TYPE directly, then ;;; information may be lost and reoptimization may not happen. ;;; -;;; What we do is intersect Rtype with Node's Derived-Type. If the +;;; What we do is intersect RTYPE with NODE's DERIVED-TYPE. If the ;;; intersection is different from the old type, then we do a -;;; Reoptimize-Continuation on the Node-Cont. +;;; REOPTIMIZE-LVAR on the NODE-LVAR. (defun derive-node-type (node rtype) - (declare (type node node) (type ctype rtype)) + (declare (type valued-node node) (type ctype rtype)) (let ((node-type (node-derived-type node))) (unless (eq node-type rtype) - (let ((int (values-type-intersection node-type rtype))) + (let ((int (values-type-intersection node-type rtype)) + (lvar (node-lvar node))) (when (type/= node-type int) (when (and *check-consistency* (eq int *empty-type*) (not (eq rtype *empty-type*))) (let ((*compiler-error-context* node)) - (compiler-warning + (compiler-warn "New inferred type ~S conflicts with old type:~ - ~% ~S~%*** Bug?" + ~% ~S~%*** possible internal error? Please report this." (type-specifier rtype) (type-specifier node-type)))) (setf (node-derived-type node) int) - (reoptimize-continuation (node-cont node)))))) + ;; If the new type consists of only one object, replace the + ;; node with a constant reference. + (when (and (ref-p node) + (lambda-var-p (ref-leaf node))) + (let ((type (single-value-type int))) + (when (and (member-type-p type) + (null (rest (member-type-members type)))) + (change-ref-leaf node (find-constant + (first (member-type-members type))))))) + (reoptimize-lvar lvar))))) (values)) ;;; This is similar to DERIVE-NODE-TYPE, but asserts that it is an -;;; error for CONT's value not to be TYPEP to TYPE. If we improve the -;;; assertion, we set TYPE-CHECK and TYPE-ASSERTED to guarantee that -;;; the new assertion will be checked. -(defun assert-continuation-type (cont type) - (declare (type continuation cont) (type ctype type)) - (let ((cont-type (continuation-asserted-type cont))) - (unless (eq cont-type type) - (let ((int (values-type-intersection cont-type type))) - (when (type/= cont-type int) - (setf (continuation-asserted-type cont) int) - (do-uses (node cont) - (setf (block-attributep (block-flags (node-block node)) - type-check type-asserted) - t)) - (reoptimize-continuation cont))))) - (values)) +;;; error for LVAR's value not to be TYPEP to TYPE. We implement it +;;; splitting off DEST a new CAST node; old LVAR will deliver values +;;; to CAST. If we improve the assertion, we set TYPE-CHECK and +;;; TYPE-ASSERTED to guarantee that the new assertion will be checked. +(defun assert-lvar-type (lvar type policy) + (declare (type lvar lvar) (type ctype type)) + (unless (values-subtypep (lvar-derived-type lvar) type) + (let* ((dest (lvar-dest lvar)) + (ctran (node-prev dest))) + (with-ir1-environment-from-node dest + (let* ((cast (make-cast lvar type policy)) + (internal-lvar (make-lvar)) + (internal-ctran (make-ctran))) + (setf (ctran-next ctran) cast + (node-prev cast) ctran) + (use-continuation cast internal-ctran internal-lvar) + (link-node-to-previous-ctran dest internal-ctran) + (substitute-lvar internal-lvar lvar) + (setf (lvar-dest lvar) cast) + (reoptimize-lvar lvar) + (when (return-p dest) + (node-ends-block cast)) + (setf (block-attributep (block-flags (node-block cast)) + type-check type-asserted) + t)))))) -;;; Assert that CALL is to a function of the specified TYPE. It is -;;; assumed that the call is legal and has only constants in the -;;; keyword positions. -(defun assert-call-type (call type) - (declare (type combination call) (type function-type type)) - (derive-node-type call (function-type-returns type)) - (let ((args (combination-args call))) - (dolist (req (function-type-required type)) - (when (null args) (return-from assert-call-type)) - (let ((arg (pop args))) - (assert-continuation-type arg req))) - (dolist (opt (function-type-optional type)) - (when (null args) (return-from assert-call-type)) - (let ((arg (pop args))) - (assert-continuation-type arg opt))) - - (let ((rest (function-type-rest type))) - (when rest - (dolist (arg args) - (assert-continuation-type arg rest)))) - - (dolist (key (function-type-keywords type)) - (let ((name (key-info-name key))) - (do ((arg args (cddr arg))) - ((null arg)) - (when (eq (continuation-value (first arg)) name) - (assert-continuation-type - (second arg) (key-info-type key))))))) - (values)) ;;;; IR1-OPTIMIZE @@ -220,166 +212,150 @@ ;;; and doing IR1 optimizations. We can ignore all blocks that don't ;;; have the REOPTIMIZE flag set. If COMPONENT-REOPTIMIZE is true when ;;; we are done, then another iteration would be beneficial. -;;; -;;; We delete blocks when there is either no predecessor or the block -;;; is in a lambda that has been deleted. These blocks would -;;; eventually be deleted by DFO recomputation, but doing it here -;;; immediately makes the effect available to IR1 optimization. (defun ir1-optimize (component) (declare (type component component)) (setf (component-reoptimize component) nil) (do-blocks (block component) (cond - ((or (block-delete-p block) - (null (block-pred block)) - (eq (functional-kind (block-home-lambda block)) :deleted)) - (delete-block block)) - (t - (loop - (let ((succ (block-succ block))) - (unless (and succ (null (rest succ))) - (return))) - - (let ((last (block-last block))) - (typecase last - (cif - (flush-dest (if-test last)) - (when (unlink-node last) - (return))) - (exit - (when (maybe-delete-exit last) - (return))))) - - (unless (join-successor-if-possible block) - (return))) - - (when (and (block-reoptimize block) (block-component block)) - (aver (not (block-delete-p block))) - (ir1-optimize-block block)) - - (when (and (block-flush-p block) (block-component block)) - (aver (not (block-delete-p block))) - (flush-dead-code block))))) + ;; We delete blocks when there is either no predecessor or the + ;; block is in a lambda that has been deleted. These blocks + ;; would eventually be deleted by DFO recomputation, but doing + ;; it here immediately makes the effect available to IR1 + ;; optimization. + ((or (block-delete-p block) + (null (block-pred block))) + (delete-block block)) + ((eq (functional-kind (block-home-lambda block)) :deleted) + ;; Preserve the BLOCK-SUCC invariant that almost every block has + ;; one successor (and a block with DELETE-P set is an acceptable + ;; exception). + (mark-for-deletion block) + (delete-block block)) + (t + (loop + (let ((succ (block-succ block))) + (unless (singleton-p succ) + (return))) + + (let ((last (block-last block))) + (typecase last + (cif + (flush-dest (if-test last)) + (when (unlink-node last) + (return))) + (exit + (when (maybe-delete-exit last) + (return))))) + + (unless (join-successor-if-possible block) + (return))) + + (when (and (block-reoptimize block) (block-component block)) + (aver (not (block-delete-p block))) + (ir1-optimize-block block)) + + (cond ((and (block-delete-p block) (block-component block)) + (delete-block block)) + ((and (block-flush-p block) (block-component block)) + (flush-dead-code block)))))) (values)) -;;; Loop over the nodes in Block, looking for stuff that needs to be -;;; optimized. We dispatch off of the type of each node with its -;;; reoptimize flag set: - -;;; -- With a combination, we call Propagate-Function-Change whenever -;;; the function changes, and call IR1-Optimize-Combination if any -;;; argument changes. -;;; -- With an Exit, we derive the node's type from the Value's type. -;;; We don't propagate Cont's assertion to the Value, since if we -;;; did, this would move the checking of Cont's assertion to the -;;; exit. This wouldn't work with Catch and UWP, where the Exit -;;; node is just a placeholder for the actual unknown exit. +;;; Loop over the nodes in BLOCK, acting on (and clearing) REOPTIMIZE +;;; flags. ;;; -;;; Note that we clear the node & block reoptimize flags *before* -;;; doing the optimization. This ensures that the node or block will -;;; be reoptimized if necessary. We leave the NODE-OPTIMIZE flag set -;;; going into IR1-OPTIMIZE-RETURN, since IR1-OPTIMIZE-RETURN wants to -;;; clear the flag itself. +;;; Note that although they are cleared here, REOPTIMIZE flags might +;;; still be set upon return from this function, meaning that further +;;; optimization is wanted (as a consequence of optimizations we did). (defun ir1-optimize-block (block) (declare (type cblock block)) + ;; We clear the node and block REOPTIMIZE flags before doing the + ;; optimization, not after. This ensures that the node or block will + ;; be reoptimized if necessary. (setf (block-reoptimize block) nil) - (do-nodes (node cont block :restart-p t) + (do-nodes (node nil block :restart-p t) (when (node-reoptimize node) + ;; As above, we clear the node REOPTIMIZE flag before optimizing. (setf (node-reoptimize node) nil) (typecase node (ref) (combination + ;; With a COMBINATION, we call PROPAGATE-FUN-CHANGE whenever + ;; the function changes, and call IR1-OPTIMIZE-COMBINATION if + ;; any argument changes. (ir1-optimize-combination node)) (cif (ir1-optimize-if node)) (creturn + ;; KLUDGE: We leave the NODE-OPTIMIZE flag set going into + ;; IR1-OPTIMIZE-RETURN, since IR1-OPTIMIZE-RETURN wants to + ;; clear the flag itself. -- WHN 2002-02-02, quoting original + ;; CMU CL comments (setf (node-reoptimize node) t) (ir1-optimize-return node)) (mv-combination (ir1-optimize-mv-combination node)) (exit + ;; With an EXIT, we derive the node's type from the VALUE's + ;; type. (let ((value (exit-value node))) (when value - (derive-node-type node (continuation-derived-type value))))) + (derive-node-type node (lvar-derived-type value))))) (cset - (ir1-optimize-set node))))) + (ir1-optimize-set node)) + (cast + (ir1-optimize-cast node))))) + (values)) -;;; We cannot combine with a successor block if: -;;; 1. The successor has more than one predecessor. -;;; 2. The last node's CONT is also used somewhere else. -;;; 3. The successor is the current block (infinite loop). -;;; 4. The next block has a different cleanup, and thus we may want -;;; to insert cleanup code between the two blocks at some point. -;;; 5. The next block has a different home lambda, and thus the -;;; control transfer is a non-local exit. -;;; -;;; If we succeed, we return true, otherwise false. -;;; -;;; Joining is easy when the successor's Start continuation is the -;;; same from our Last's Cont. If they differ, then we can still join -;;; when the last continuation has no next and the next continuation -;;; has no uses. In this case, we replace the next continuation with -;;; the last before joining the blocks. +;;; Try to join with a successor block. If we succeed, we return true, +;;; otherwise false. (defun join-successor-if-possible (block) (declare (type cblock block)) (let ((next (first (block-succ block)))) - (when (block-start next) - (let* ((last (block-last block)) - (last-cont (node-cont last)) - (next-cont (block-start next))) - (cond ((or (rest (block-pred next)) - (not (eq (continuation-use last-cont) last)) - (eq next block) - (not (eq (block-end-cleanup block) - (block-start-cleanup next))) - (not (eq (block-home-lambda block) - (block-home-lambda next)))) - nil) - ((eq last-cont next-cont) - (join-blocks block next) - t) - ((and (null (block-start-uses next)) - (eq (continuation-kind last-cont) :inside-block)) - (let ((next-node (continuation-next next-cont))) - ;; If next-cont does have a dest, it must be - ;; unreachable, since there are no uses. - ;; DELETE-CONTINUATION will mark the dest block as - ;; delete-p [and also this block, unless it is no - ;; longer backward reachable from the dest block.] - (delete-continuation next-cont) - (setf (node-prev next-node) last-cont) - (setf (continuation-next last-cont) next-node) - (setf (block-start next) last-cont) - (join-blocks block next)) - t) - (t - nil)))))) - -;;; Join together two blocks which have the same ending/starting -;;; continuation. The code in Block2 is moved into Block1 and Block2 -;;; is deleted from the DFO. We combine the optimize flags for the two -;;; blocks so that any indicated optimization gets done. + (when (block-start next) ; NEXT is not an END-OF-COMPONENT marker + (cond ( ;; We cannot combine with a successor block if: + (or + ;; The successor has more than one predecessor. + (rest (block-pred next)) + ;; The successor is the current block (infinite loop). + (eq next block) + ;; The next block has a different cleanup, and thus + ;; we may want to insert cleanup code between the + ;; two blocks at some point. + (not (eq (block-end-cleanup block) + (block-start-cleanup next))) + ;; The next block has a different home lambda, and + ;; thus the control transfer is a non-local exit. + (not (eq (block-home-lambda block) + (block-home-lambda next)))) + nil) + (t + (join-blocks block next) + t))))) + +;;; Join together two blocks. The code in BLOCK2 is moved into BLOCK1 +;;; and BLOCK2 is deleted from the DFO. We combine the optimize flags +;;; for the two blocks so that any indicated optimization gets done. (defun join-blocks (block1 block2) (declare (type cblock block1 block2)) - (let* ((last (block-last block2)) - (last-cont (node-cont last)) + (let* ((last1 (block-last block1)) + (last2 (block-last block2)) (succ (block-succ block2)) (start2 (block-start block2))) - (do ((cont start2 (node-cont (continuation-next cont)))) - ((eq cont last-cont) - (when (eq (continuation-kind last-cont) :inside-block) - (setf (continuation-block last-cont) block1))) - (setf (continuation-block cont) block1)) + (do ((ctran start2 (node-next (ctran-next ctran)))) + ((not ctran)) + (setf (ctran-block ctran) block1)) (unlink-blocks block1 block2) (dolist (block succ) (unlink-blocks block2 block) (link-blocks block1 block)) - (setf (block-last block1) last) - (setf (continuation-kind start2) :inside-block)) + (setf (ctran-kind start2) :inside-block) + (setf (node-next last1) start2) + (setf (ctran-use start2) last1) + (setf (block-last block1) last2)) (setf (block-flags block1) (attributes-union (block-flags block1) @@ -393,31 +369,32 @@ (values)) -;;; Delete any nodes in BLOCK whose value is unused and have no -;;; side-effects. We can delete sets of lexical variables when the set +;;; Delete any nodes in BLOCK whose value is unused and which have no +;;; side effects. We can delete sets of lexical variables when the set ;;; variable has no references. -;;; -;;; [### For now, don't delete potentially flushable calls when they -;;; have the CALL attribute. Someday we should look at the funcitonal -;;; args to determine if they have any side-effects.] (defun flush-dead-code (block) (declare (type cblock block)) - (do-nodes-backwards (node cont block) - (unless (continuation-dest cont) + (setf (block-flush-p block) nil) + (do-nodes-backwards (node lvar block) + (unless lvar (typecase node (ref (delete-ref node) (unlink-node node)) (combination (let ((info (combination-kind node))) - (when (function-info-p info) - (let ((attr (function-info-attributes info))) - (when (and (ir1-attributep attr flushable) - (not (ir1-attributep attr call))) - (flush-dest (combination-fun node)) - (dolist (arg (combination-args node)) - (flush-dest arg)) - (unlink-node node)))))) + (when (fun-info-p info) + (let ((attr (fun-info-attributes info))) + (when (and (not (ir1-attributep attr call)) + ;; ### For now, don't delete potentially + ;; flushable calls when they have the CALL + ;; attribute. Someday we should look at the + ;; functional args to determine if they have + ;; any side effects. + (if (policy node (= safety 3)) + (ir1-attributep attr flushable) + (ir1-attributep attr unsafely-flushable))) + (flush-combination node)))))) (mv-combination (when (eq (basic-combination-kind node) :local) (let ((fun (combination-lambda node))) @@ -438,10 +415,13 @@ (null (leaf-refs var))) (flush-dest (set-value node)) (setf (basic-var-sets var) - (delete node (basic-var-sets var))) - (unlink-node node))))))) + (delq node (basic-var-sets var))) + (unlink-node node)))) + (cast + (unless (cast-type-check node) + (flush-dest (cast-value node)) + (unlink-node node)))))) - (setf (block-flush-p block) nil) (values)) ;;;; local call return type propagation @@ -475,9 +455,12 @@ (return-from find-result-type (values))))) (t (use-union (node-derived-type use))))) - (let ((int (values-type-intersection - (continuation-asserted-type result) - (use-union)))) + (let ((int + ;; (values-type-intersection + ;; (continuation-asserted-type result) ; FIXME -- APD, 2002-01-26 + (use-union) + ;; ) + )) (setf (return-result-type node) int)))) (values)) @@ -486,17 +469,17 @@ ;;; all functions in the tail set to be equivalent, this amounts to ;;; bringing the entire tail set up to date. We iterate over the ;;; returns for all the functions in the tail set, reanalyzing them -;;; all (not treating Node specially.) +;;; all (not treating NODE specially.) ;;; ;;; When we are done, we check whether the new type is different from ;;; the old TAIL-SET-TYPE. If so, we set the type and also reoptimize -;;; all the continuations for references to functions in the tail set. -;;; This will cause IR1-OPTIMIZE-COMBINATION to derive the new type as -;;; the results of the calls. +;;; all the lvars for references to functions in the tail set. This +;;; will cause IR1-OPTIMIZE-COMBINATION to derive the new type as the +;;; results of the calls. (defun ir1-optimize-return (node) (declare (type creturn node)) (let* ((tails (lambda-tail-set (return-lambda node))) - (funs (tail-set-functions tails))) + (funs (tail-set-funs tails))) (collect ((res *empty-type* values-type-union)) (dolist (fun funs) (let ((return (lambda-return fun))) @@ -508,9 +491,9 @@ (when (type/= (res) (tail-set-type tails)) (setf (tail-set-type tails) (res)) - (dolist (fun (tail-set-functions tails)) + (dolist (fun (tail-set-funs tails)) (dolist (ref (leaf-refs fun)) - (reoptimize-continuation (node-cont ref))))))) + (reoptimize-lvar (node-lvar ref))))))) (values)) @@ -525,35 +508,34 @@ (let ((test (if-test node)) (block (node-block node))) - (when (and (eq (block-start block) test) - (eq (continuation-next test) node) - (rest (block-start-uses block))) + (when (and (eq (block-start-node block) node) + (listp (lvar-uses test))) (do-uses (use test) (when (immediately-used-p test use) (convert-if-if use node) - (when (continuation-use test) (return))))) - - (let* ((type (continuation-type test)) - (victim - (cond ((constant-continuation-p test) - (if (continuation-value test) - (if-alternative node) - (if-consequent node))) - ((not (types-equal-or-intersect type (specifier-type 'null))) - (if-alternative node)) - ((type= type (specifier-type 'null)) - (if-consequent node))))) + (when (not (listp (lvar-uses test))) (return))))) + + (let* ((type (lvar-type test)) + (victim + (cond ((constant-lvar-p test) + (if (lvar-value test) + (if-alternative node) + (if-consequent node))) + ((not (types-equal-or-intersect type (specifier-type 'null))) + (if-alternative node)) + ((type= type (specifier-type 'null)) + (if-consequent node))))) (when victim - (flush-dest test) - (when (rest (block-succ block)) - (unlink-blocks block victim)) - (setf (component-reanalyze (block-component (node-block node))) t) - (unlink-node node)))) + (flush-dest test) + (when (rest (block-succ block)) + (unlink-blocks block victim)) + (setf (component-reanalyze (node-component node)) t) + (unlink-node node)))) (values)) -;;; Create a new copy of an IF Node that tests the value of the node -;;; Use. The test must have >1 use, and must be immediately used by -;;; Use. Node must be the only node in its block (implying that +;;; Create a new copy of an IF node that tests the value of the node +;;; USE. The test must have >1 use, and must be immediately used by +;;; USE. NODE must be the only node in its block (implying that ;;; block-start = if-test). ;;; ;;; This optimization has an effect semantically similar to the @@ -567,26 +549,25 @@ ;;; become unreachable, resulting in a spurious note. (defun convert-if-if (use node) (declare (type node use) (type cif node)) - (with-ir1-environment node + (with-ir1-environment-from-node node (let* ((block (node-block node)) (test (if-test node)) (cblock (if-consequent node)) (ablock (if-alternative node)) (use-block (node-block use)) - (dummy-cont (make-continuation)) - (new-cont (make-continuation)) - (new-node (make-if :test new-cont + (new-ctran (make-ctran)) + (new-lvar (make-lvar)) + (new-node (make-if :test new-lvar :consequent cblock :alternative ablock)) - (new-block (continuation-starts-block new-cont))) - (prev-link new-node new-cont) - (setf (continuation-dest new-cont) new-node) - (add-continuation-use new-node dummy-cont) + (new-block (ctran-starts-block new-ctran))) + (link-node-to-previous-ctran new-node new-ctran) + (setf (lvar-dest new-lvar) new-node) (setf (block-last new-block) new-node) (unlink-blocks use-block block) - (delete-continuation-use use) - (add-continuation-use use new-cont) + (%delete-lvar-use use) + (add-lvar-use use new-lvar) (link-blocks use-block new-block) (link-blocks new-block cblock) @@ -595,8 +576,8 @@ (push "" (node-source-path node)) (push "" (node-source-path new-node)) - (reoptimize-continuation test) - (reoptimize-continuation new-cont) + (reoptimize-lvar test) + (reoptimize-lvar new-lvar) (setf (component-reanalyze *current-component*) t))) (values)) @@ -604,11 +585,11 @@ ;;; This function attempts to delete an exit node, returning true if ;;; it deletes the block as a consequence: -;;; -- If the exit is degenerate (has no Entry), then we don't do +;;; -- If the exit is degenerate (has no ENTRY), then we don't do ;;; anything, since there is nothing to be done. -;;; -- If the exit node and its Entry have the same home lambda then +;;; -- If the exit node and its ENTRY have the same home lambda then ;;; we know the exit is local, and can delete the exit. We change -;;; uses of the Exit-Value to be uses of the original continuation, +;;; uses of the Exit-Value to be uses of the original lvar, ;;; then unlink the node. If the exit is to a TR context, then we ;;; must do MERGE-TAIL-SETS on any local calls which delivered ;;; their value to this exit. @@ -621,23 +602,14 @@ (defun maybe-delete-exit (node) (declare (type exit node)) (let ((value (exit-value node)) - (entry (exit-entry node)) - (cont (node-cont node))) + (entry (exit-entry node))) (when (and entry (eq (node-home-lambda node) (node-home-lambda entry))) - (setf (entry-exits entry) (delete node (entry-exits entry))) - (prog1 - (unlink-node node) - (when value - (collect ((merges)) - (when (return-p (continuation-dest cont)) - (do-uses (use value) - (when (and (basic-combination-p use) - (eq (basic-combination-kind use) :local)) - (merges use)))) - (substitute-continuation-uses cont value) - (dolist (merge (merges)) - (merge-tail-sets merge)))))))) + (setf (entry-exits entry) (delq node (entry-exits entry))) + (if value + (delete-filter node (node-lvar node) value) + (unlink-node node))))) + ;;;; combination IR1 optimization @@ -648,8 +620,8 @@ ;;; Do IR1 optimizations on a COMBINATION node. (declaim (ftype (function (combination) (values)) ir1-optimize-combination)) (defun ir1-optimize-combination (node) - (when (continuation-reoptimize (basic-combination-fun node)) - (propagate-function-change node)) + (when (lvar-reoptimize (basic-combination-fun node)) + (propagate-fun-change node)) (let ((args (basic-combination-args node)) (kind (basic-combination-kind node))) (case kind @@ -661,21 +633,21 @@ ((:full :error) (dolist (arg args) (when arg - (setf (continuation-reoptimize arg) nil)))) + (setf (lvar-reoptimize arg) nil)))) (t (dolist (arg args) (when arg - (setf (continuation-reoptimize arg) nil))) + (setf (lvar-reoptimize arg) nil))) - (let ((attr (function-info-attributes kind))) + (let ((attr (fun-info-attributes kind))) (when (and (ir1-attributep attr foldable) ;; KLUDGE: The next test could be made more sensitive, ;; only suppressing constant-folding of functions with ;; CALL attributes when they're actually passed ;; function arguments. -- WHN 19990918 (not (ir1-attributep attr call)) - (every #'constant-continuation-p args) - (continuation-dest (node-cont node)) + (every #'constant-lvar-p args) + (node-lvar node) ;; Even if the function is foldable in principle, ;; it might be one of our low-level ;; implementation-specific functions. Such @@ -685,26 +657,28 @@ ;; cross-compiler can't fold it because the ;; cross-compiler doesn't know how to evaluate it. #+sb-xc-host - (let* ((ref (continuation-use (combination-fun node))) - (fun (leaf-name (ref-leaf ref)))) - (fboundp fun))) + (or (fboundp (combination-fun-source-name node)) + (progn (format t ";;; !!! Unbound fun: (~S~{ ~S~})~%" + (combination-fun-source-name node) + (mapcar #'lvar-value args)) + nil))) (constant-fold-call node) (return-from ir1-optimize-combination))) - (let ((fun (function-info-derive-type kind))) + (let ((fun (fun-info-derive-type kind))) (when fun (let ((res (funcall fun node))) (when res - (derive-node-type node res) + (derive-node-type node (coerce-to-values res)) (maybe-terminate-block node nil))))) - (let ((fun (function-info-optimizer kind))) + (let ((fun (fun-info-optimizer kind))) (unless (and fun (funcall fun node)) - (dolist (x (function-info-transforms kind)) - #!+sb-show + (dolist (x (fun-info-transforms kind)) + #!+sb-show (when *show-transforms-p* - (let* ((cont (basic-combination-fun node)) - (fname (continuation-function-name cont t))) + (let* ((lvar (basic-combination-fun node)) + (fname (lvar-fun-name lvar t))) (/show "trying transform" x (transform-function x) "for" fname))) (unless (ir1-transform node x) #!+sb-show @@ -714,51 +688,52 @@ (values)) -;;; If Call is to a function that doesn't return (i.e. return type is -;;; NIL), then terminate the block there, and link it to the component -;;; tail. We also change the call's CONT to be a dummy continuation to -;;; prevent the use from confusing things. +;;; If NODE doesn't return (i.e. return type is NIL), then terminate +;;; the block there, and link it to the component tail. ;;; -;;; Except when called during IR1, we delete the continuation if it -;;; has no other uses. (If it does have other uses, we reoptimize.) +;;; Except when called during IR1 convertion, we delete the +;;; continuation if it has no other uses. (If it does have other uses, +;;; we reoptimize.) ;;; -;;; Termination on the basis of a continuation type assertion is +;;; Termination on the basis of a continuation type is ;;; inhibited when: ;;; -- The continuation is deleted (hence the assertion is spurious), or ;;; -- We are in IR1 conversion (where THE assertions are subject to -;;; weakening.) -(defun maybe-terminate-block (call ir1-p) - (declare (type basic-combination call)) - (let* ((block (node-block call)) - (cont (node-cont call)) +;;; weakening.) FIXME: Now THE assertions are not weakened, but new +;;; uses can(?) be added later. -- APD, 2003-07-17 +;;; +;;; Why do we need to consider LVAR type? -- APD, 2003-07-30 +(defun maybe-terminate-block (node ir1-converting-not-optimizing-p) + (declare (type (or basic-combination cast) node)) + (let* ((block (node-block node)) + (lvar (node-lvar node)) + (ctran (node-next node)) (tail (component-tail (block-component block))) (succ (first (block-succ block)))) - (unless (or (and (eq call (block-last block)) (eq succ tail)) + (unless (or (and (eq node (block-last block)) (eq succ tail)) (block-delete-p block)) - (when (or (and (eq (continuation-asserted-type cont) *empty-type*) - (not (or ir1-p (eq (continuation-kind cont) :deleted)))) - (eq (node-derived-type call) *empty-type*)) - (cond (ir1-p - (delete-continuation-use call) + (when (eq (node-derived-type node) *empty-type*) + (cond (ir1-converting-not-optimizing-p (cond - ((block-last block) - (aver (and (eq (block-last block) call) - (eq (continuation-kind cont) :block-start)))) - (t - (setf (block-last block) call) - (link-blocks block (continuation-starts-block cont))))) + ((block-last block) + (aver (eq (block-last block) node))) + (t + (setf (block-last block) node) + (setf (ctran-use ctran) nil) + (setf (ctran-kind ctran) :unused) + (setf (ctran-block ctran) nil) + (setf (node-next node) nil) + (link-blocks block (ctran-starts-block ctran))))) (t - (node-ends-block call) - (delete-continuation-use call) - (if (eq (continuation-kind cont) :unused) - (delete-continuation cont) - (reoptimize-continuation cont)))) - + (node-ends-block node))) + (unlink-blocks block (first (block-succ block))) (setf (component-reanalyze (block-component block)) t) (aver (not (block-succ block))) (link-blocks block tail) - (add-continuation-use call (make-continuation)) + (if ir1-converting-not-optimizing-p + (%delete-lvar-use node) + (delete-lvar-use node)) t)))) ;;; This is called both by IR1 conversion and IR1 optimization when @@ -766,30 +741,24 @@ ;;; wondering if something should be done to special-case the call. If ;;; CALL is a call to a global function, then see whether it defined ;;; or known: -;;; -- If a DEFINED-FUNCTION should be inline expanded, then convert +;;; -- If a DEFINED-FUN should be inline expanded, then convert ;;; the expansion and change the call to call it. Expansion is ;;; enabled if :INLINE or if SPACE=0. If the FUNCTIONAL slot is ;;; true, we never expand, since this function has already been -;;; converted. Local call analysis will duplicate the definition if -;;; necessary. We claim that the parent form is LABELS for context -;;; declarations, since we don't want it to be considered a real -;;; global function. -;;; -- In addition to a direct check for the function name in the -;;; table, we also must check for slot accessors. If the function -;;; is a slot accessor, then we set the combination kind to the -;;; function info of %Slot-Setter or %Slot-Accessor, as -;;; appropriate. +;;; converted. Local call analysis will duplicate the definition +;;; if necessary. We claim that the parent form is LABELS for +;;; context declarations, since we don't want it to be considered +;;; a real global function. ;;; -- If it is a known function, mark it as such by setting the KIND. ;;; ;;; We return the leaf referenced (NIL if not a leaf) and the -;;; FUNCTION-INFO assigned. -(defun recognize-known-call (call ir1-p) +;;; FUN-INFO assigned. +(defun recognize-known-call (call ir1-converting-not-optimizing-p) (declare (type combination call)) - (let* ((ref (continuation-use (basic-combination-fun call))) + (let* ((ref (lvar-uses (basic-combination-fun call))) (leaf (when (ref-p ref) (ref-leaf ref))) - (inlinep (if (and (defined-function-p leaf) - (not (byte-compiling))) - (defined-function-inlinep leaf) + (inlinep (if (defined-fun-p leaf) + (defined-fun-inlinep leaf) :no-chance))) (cond ((eq inlinep :notinline) (values nil nil)) @@ -800,34 +769,32 @@ (:inline t) (:no-chance nil) ((nil :maybe-inline) (policy call (zerop space)))) - (defined-function-inline-expansion leaf) - (let ((fun (defined-function-functional leaf))) + (defined-fun-p leaf) + (defined-fun-inline-expansion leaf) + (let ((fun (defined-fun-functional leaf))) (or (not fun) (and (eq inlinep :inline) (functional-kind fun)))) (inline-expansion-ok call)) - (flet ((frob () + (flet (;; FIXME: Is this what the old CMU CL internal documentation + ;; called semi-inlining? A more descriptive name would + ;; be nice. -- WHN 2002-01-07 + (frob () (let ((res (ir1-convert-lambda-for-defun - (defined-function-inline-expansion leaf) + (defined-fun-inline-expansion leaf) leaf t #'ir1-convert-inline-lambda))) - (setf (defined-function-functional leaf) res) + (setf (defined-fun-functional leaf) res) (change-ref-leaf ref res)))) - (if ir1-p + (if ir1-converting-not-optimizing-p (frob) - (with-ir1-environment call + (with-ir1-environment-from-node call (frob) - (local-call-analyze *current-component*)))) + (locall-analyze-component *current-component*)))) - (values (ref-leaf (continuation-use (basic-combination-fun call))) + (values (ref-leaf (lvar-uses (basic-combination-fun call))) nil)) (t - (let* ((name (leaf-name leaf)) - (info (info :function :info - (if (slot-accessor-p leaf) - (if (consp name) - '%slot-setter - '%slot-accessor) - name)))) + (let ((info (info :function :info (leaf-source-name leaf)))) (if info (values leaf (setf (basic-combination-kind call) info)) (values leaf nil))))))) @@ -839,53 +806,53 @@ ;;; syntax check, arg/result type processing, but still call ;;; RECOGNIZE-KNOWN-CALL, since the call might be to a known lambda, ;;; and that checking is done by local call analysis. -(defun validate-call-type (call type ir1-p) +(defun validate-call-type (call type ir1-converting-not-optimizing-p) (declare (type combination call) (type ctype type)) - (cond ((not (function-type-p type)) + (cond ((not (fun-type-p type)) (aver (multiple-value-bind (val win) (csubtypep type (specifier-type 'function)) (or val (not win)))) - (recognize-known-call call ir1-p)) - ((valid-function-use call type - :argument-test #'always-subtypep - :result-test #'always-subtypep - ;; KLUDGE: Common Lisp is such a dynamic - ;; language that all we can do here in - ;; general is issue a STYLE-WARNING. It - ;; would be nice to issue a full WARNING - ;; in the special case of of type - ;; mismatches within a compilation unit - ;; (as in section 3.2.2.3 of the spec) - ;; but at least as of sbcl-0.6.11, we - ;; don't keep track of whether the - ;; mismatched data came from the same - ;; compilation unit, so we can't do that. - ;; -- WHN 2001-02-11 - ;; - ;; FIXME: Actually, I think we could - ;; issue a full WARNING if the call - ;; violates a DECLAIM FTYPE. - :error-function #'compiler-style-warning - :warning-function #'compiler-note) + (recognize-known-call call ir1-converting-not-optimizing-p)) + ((valid-fun-use call type + :argument-test #'always-subtypep + :result-test #'always-subtypep + ;; KLUDGE: Common Lisp is such a dynamic + ;; language that all we can do here in + ;; general is issue a STYLE-WARNING. It + ;; would be nice to issue a full WARNING + ;; in the special case of of type + ;; mismatches within a compilation unit + ;; (as in section 3.2.2.3 of the spec) + ;; but at least as of sbcl-0.6.11, we + ;; don't keep track of whether the + ;; mismatched data came from the same + ;; compilation unit, so we can't do that. + ;; -- WHN 2001-02-11 + ;; + ;; FIXME: Actually, I think we could + ;; issue a full WARNING if the call + ;; violates a DECLAIM FTYPE. + :lossage-fun #'compiler-style-warn + :unwinnage-fun #'compiler-notify) (assert-call-type call type) - (maybe-terminate-block call ir1-p) - (recognize-known-call call ir1-p)) + (maybe-terminate-block call ir1-converting-not-optimizing-p) + (recognize-known-call call ir1-converting-not-optimizing-p)) (t (setf (combination-kind call) :error) (values nil nil)))) ;;; This is called by IR1-OPTIMIZE when the function for a call has -;;; changed. If the call is local, we try to let-convert it, and +;;; changed. If the call is local, we try to LET-convert it, and ;;; derive the result type. If it is a :FULL call, we validate it ;;; against the type, which recognizes known calls, does inline ;;; expansion, etc. If a call to a predicate in a non-conditional ;;; position or to a function with a source transform, then we ;;; reconvert the form to give IR1 another chance. -(defun propagate-function-change (call) +(defun propagate-fun-change (call) (declare (type combination call)) (let ((*compiler-error-context* call) - (fun-cont (basic-combination-fun call))) - (setf (continuation-reoptimize fun-cont) nil) + (fun-lvar (basic-combination-fun call))) + (setf (lvar-reoptimize fun-lvar) nil) (case (combination-kind call) (:local (let ((fun (combination-lambda call))) @@ -894,25 +861,29 @@ (derive-node-type call (tail-set-type (lambda-tail-set fun)))))) (:full (multiple-value-bind (leaf info) - (validate-call-type call (continuation-type fun-cont) nil) + (validate-call-type call (lvar-type fun-lvar) nil) (cond ((functional-p leaf) (convert-call-if-possible - (continuation-use (basic-combination-fun call)) + (lvar-uses (basic-combination-fun call)) call)) ((not leaf)) - ((or (info :function :source-transform (leaf-name leaf)) - (and info - (ir1-attributep (function-info-attributes info) - predicate) - (let ((dest (continuation-dest (node-cont call)))) - (and dest (not (if-p dest)))))) - (let ((name (leaf-name leaf))) - (when (symbolp name) - (let ((dums (make-gensym-list (length - (combination-args call))))) - (transform-call call - `(lambda ,dums - (,name ,@dums)))))))))))) + ((and (leaf-has-source-name-p leaf) + (or (info :function :source-transform (leaf-source-name leaf)) + (and info + (ir1-attributep (fun-info-attributes info) + predicate) + (let ((lvar (node-lvar call))) + (and lvar (not (if-p (lvar-dest lvar)))))))) + (let ((name (leaf-source-name leaf)) + (dummies (make-gensym-list + (length (combination-args call))))) + (transform-call call + `(lambda ,dummies + (,@(if (symbolp name) + `(,name) + `(funcall #',name)) + ,@dummies)) + (leaf-source-name leaf))))))))) (values)) ;;;; known function optimization @@ -922,7 +893,7 @@ ;;; replace it, otherwise add a new one. (defun record-optimization-failure (node transform args) (declare (type combination node) (type transform transform) - (type (or function-type list) args)) + (type (or fun-type list) args)) (let* ((table (component-failed-optimizations *component-being-compiled*)) (found (assoc transform (gethash node table)))) (if found @@ -941,32 +912,19 @@ (declare (type combination node) (type transform transform)) (let* ((type (transform-type transform)) (fun (transform-function transform)) - (constrained (function-type-p type)) + (constrained (fun-type-p type)) (table (component-failed-optimizations *component-being-compiled*)) (flame (if (transform-important transform) (policy node (>= speed inhibit-warnings)) (policy node (> speed inhibit-warnings)))) (*compiler-error-context* node)) - (cond ((not (member (transform-when transform) - (if *byte-compiling* - '(:byte :both) - '(:native :both)))) - ;; FIXME: Make sure that there's a transform for - ;; (MEMBER SYMBOL ..) into MEMQ. - ;; FIXME: Note that when/if I make SHARE operation to shared - ;; constant data between objects in the system, remember that a - ;; SHAREd list, or other SHAREd compound object, can be processed - ;; recursively, so that e.g. the two lists above can share their - ;; '(:BOTH) tail sublists. - (let ((when (transform-when transform))) - (not (or (eq when :both) - (eq when (if *byte-compiling* :byte :native))))) - t) - ((or (not constrained) - (valid-function-use node type :strict-result t)) + (cond ((or (not constrained) + (valid-fun-use node type)) (multiple-value-bind (severity args) (catch 'give-up-ir1-transform - (transform-call node (funcall fun node)) + (transform-call node + (funcall fun node) + (combination-fun-source-name node)) (values :none nil)) (ecase severity (:none @@ -975,7 +933,7 @@ (:aborted (setf (combination-kind node) :error) (when args - (apply #'compiler-warning args)) + (apply #'compiler-warn args)) (remhash node table) nil) (:failure @@ -989,18 +947,17 @@ (remhash node table) nil)))) ((and flame - (valid-function-use node - type - :argument-test #'types-equal-or-intersect - :result-test - #'values-types-equal-or-intersect)) + (valid-fun-use node + type + :argument-test #'types-equal-or-intersect + :result-test #'values-types-equal-or-intersect)) (record-optimization-failure node transform type) t) (t t)))) ;;; When we don't like an IR1 transform, we throw the severity/reason -;;; and args. +;;; and args. ;;; ;;; GIVE-UP-IR1-TRANSFORM is used to throw out of an IR1 transform, ;;; aborting this attempt to transform the call, but admitting the @@ -1063,48 +1020,105 @@ (setf (component-reoptimize (block-component block)) t))))))) reoptimize)) - ;;; Take the lambda-expression RES, IR1 convert it in the proper ;;; environment, and then install it as the function for the call ;;; NODE. We do local call analysis so that the new function is ;;; integrated into the control flow. -(defun transform-call (node res) - (declare (type combination node) (list res)) - (with-ir1-environment node - (let ((new-fun (ir1-convert-inline-lambda res)) - (ref (continuation-use (combination-fun node)))) - (change-ref-leaf ref new-fun) - (setf (combination-kind node) :full) - (local-call-analyze *current-component*))) +;;; +;;; We require the original function source name in order to generate +;;; a meaningful debug name for the lambda we set up. (It'd be +;;; possible to do this starting from debug names as well as source +;;; names, but as of sbcl-0.7.1.5, there was no need for this +;;; generality, since source names are always known to our callers.) +(defun transform-call (call res source-name) + (declare (type combination call) (list res)) + (aver (and (legal-fun-name-p source-name) + (not (eql source-name '.anonymous.)))) + (node-ends-block call) + (with-ir1-environment-from-node call + (with-component-last-block (*current-component* + (block-next (node-block call))) + (let ((new-fun (ir1-convert-inline-lambda + res + :debug-name (debug-namify "LAMBDA-inlined ~A" + (as-debug-name + source-name + "")))) + (ref (lvar-use (combination-fun call)))) + (change-ref-leaf ref new-fun) + (setf (combination-kind call) :full) + (locall-analyze-component *current-component*)))) (values)) ;;; Replace a call to a foldable function of constant arguments with -;;; the result of evaluating the form. We insert the resulting -;;; constant node after the call, stealing the call's continuation. We -;;; give the call a continuation with no Dest, which should cause it -;;; and its arguments to go away. If there is an error during the +;;; the result of evaluating the form. If there is an error during the ;;; evaluation, we give a warning and leave the call alone, making the ;;; call a :ERROR call. ;;; ;;; If there is more than one value, then we transform the call into a -;;; values form. +;;; VALUES form. (defun constant-fold-call (call) - (declare (type combination call)) - (let* ((args (mapcar #'continuation-value (combination-args call))) - (ref (continuation-use (combination-fun call))) - (fun (leaf-name (ref-leaf ref)))) - + (let ((args (mapcar #'lvar-value (combination-args call))) + (fun-name (combination-fun-source-name call))) (multiple-value-bind (values win) - (careful-call fun args call "constant folding") - (if (not win) - (setf (combination-kind call) :error) - (let ((dummies (make-gensym-list (length args)))) - (transform-call - call - `(lambda ,dummies - (declare (ignore ,@dummies)) - (values ,@(mapcar #'(lambda (x) `',x) values)))))))) - + (careful-call fun-name + args + call + ;; Note: CMU CL had COMPILER-WARN here, and that + ;; seems more natural, but it's probably not. + ;; + ;; It's especially not while bug 173 exists: + ;; Expressions like + ;; (COND (END + ;; (UNLESS (OR UNSAFE? (<= END SIZE))) + ;; ...)) + ;; can cause constant-folding TYPE-ERRORs (in + ;; #'<=) when END can be proved to be NIL, even + ;; though the code is perfectly legal and safe + ;; because a NIL value of END means that the + ;; #'<= will never be executed. + ;; + ;; Moreover, even without bug 173, + ;; quite-possibly-valid code like + ;; (COND ((NONINLINED-PREDICATE END) + ;; (UNLESS (<= END SIZE)) + ;; ...)) + ;; (where NONINLINED-PREDICATE is something the + ;; compiler can't do at compile time, but which + ;; turns out to make the #'<= expression + ;; unreachable when END=NIL) could cause errors + ;; when the compiler tries to constant-fold (<= + ;; END SIZE). + ;; + ;; So, with or without bug 173, it'd be + ;; unnecessarily evil to do a full + ;; COMPILER-WARNING (and thus return FAILURE-P=T + ;; from COMPILE-FILE) for legal code, so we we + ;; use a wimpier COMPILE-STYLE-WARNING instead. + #'compiler-style-warn + "constant folding") + (cond ((not win) + (setf (combination-kind call) :error)) + ((and (proper-list-of-length-p values 1)) + (with-ir1-environment-from-node call + (let* ((lvar (node-lvar call)) + (prev (node-prev call)) + (intermediate-ctran (make-ctran))) + (%delete-lvar-use call) + (setf (ctran-next prev) nil) + (setf (node-prev call) nil) + (reference-constant prev intermediate-ctran lvar + (first values)) + (link-node-to-previous-ctran call intermediate-ctran) + (reoptimize-lvar lvar) + (flush-combination call)))) + (t (let ((dummies (make-gensym-list (length args)))) + (transform-call + call + `(lambda ,dummies + (declare (ignore ,@dummies)) + (values ,@(mapcar (lambda (x) `',x) values))) + fun-name)))))) (values)) ;;;; local call optimization @@ -1116,23 +1130,88 @@ (defun propagate-to-refs (leaf type) (declare (type leaf leaf) (type ctype type)) (let ((var-type (leaf-type leaf))) - (unless (function-type-p var-type) + (unless (fun-type-p var-type) (let ((int (type-approx-intersection2 var-type type))) (when (type/= int var-type) (setf (leaf-type leaf) int) (dolist (ref (leaf-refs leaf)) - (derive-node-type ref int)))) + (derive-node-type ref (make-single-value-type int)) + ;; KLUDGE: LET var substitution + (let* ((lvar (node-lvar ref))) + (when (and lvar (combination-p (lvar-dest lvar))) + (reoptimize-lvar lvar)))))) (values)))) +;;; Iteration variable: exactly one SETQ of the form: +;;; +;;; (let ((var initial)) +;;; ... +;;; (setq var (+ var step)) +;;; ...) +(defun maybe-infer-iteration-var-type (var initial-type) + (binding* ((sets (lambda-var-sets var) :exit-if-null) + (set (first sets)) + (() (null (rest sets)) :exit-if-null) + (set-use (principal-lvar-use (set-value set))) + (() (and (combination-p set-use) + (fun-info-p (combination-kind set-use)) + (eq (combination-fun-source-name set-use) '+)) + :exit-if-null) + (+-args (basic-combination-args set-use)) + (() (and (proper-list-of-length-p +-args 2 2) + (let ((first (principal-lvar-use + (first +-args)))) + (and (ref-p first) + (eq (ref-leaf first) var)))) + :exit-if-null) + (step-type (lvar-type (second +-args))) + (set-type (lvar-type (set-value set)))) + (when (and (numeric-type-p initial-type) + (numeric-type-p step-type) + (numeric-type-equal initial-type step-type)) + (multiple-value-bind (low high) + (cond ((csubtypep step-type (specifier-type '(real 0 *))) + (values (numeric-type-low initial-type) + (when (and (numeric-type-p set-type) + (numeric-type-equal set-type initial-type)) + (numeric-type-high set-type)))) + ((csubtypep step-type (specifier-type '(real * 0))) + (values (when (and (numeric-type-p set-type) + (numeric-type-equal set-type initial-type)) + (numeric-type-low set-type)) + (numeric-type-high initial-type))) + (t + (values nil nil))) + (modified-numeric-type initial-type + :low low + :high high + :enumerable nil))))) +(deftransform + ((x y) * * :result result) + "check for iteration variable reoptimization" + (let ((dest (principal-lvar-end result)) + (use (principal-lvar-use x))) + (when (and (ref-p use) + (set-p dest) + (eq (ref-leaf use) + (set-var dest))) + (reoptimize-lvar (set-value dest)))) + (give-up-ir1-transform)) + ;;; Figure out the type of a LET variable that has sets. We compute -;;; the union of the initial value Type and the types of all the set +;;; the union of the INITIAL-TYPE and the types of all the set ;;; values and to a PROPAGATE-TO-REFS with this type. -(defun propagate-from-sets (var type) - (collect ((res type type-union)) +(defun propagate-from-sets (var initial-type) + (collect ((res initial-type type-union)) (dolist (set (basic-var-sets var)) - (res (continuation-type (set-value set))) - (setf (node-reoptimize set) nil)) - (propagate-to-refs var (res))) + (let ((type (lvar-type (set-value set)))) + (res type) + (when (node-reoptimize set) + (derive-node-type set (make-single-value-type type)) + (setf (node-reoptimize set) nil)))) + (let ((res (res))) + (awhen (maybe-infer-iteration-var-type var initial-type) + (setq res it)) + (propagate-to-refs var res))) (values)) ;;; If a LET variable, find the initial value's type and do @@ -1144,14 +1223,16 @@ (when (and (lambda-var-p var) (leaf-refs var)) (let ((home (lambda-var-home var))) (when (eq (functional-kind home) :let) - (let ((iv (let-var-initial-value var))) - (setf (continuation-reoptimize iv) nil) - (propagate-from-sets var (continuation-type iv))))))) + (let* ((initial-value (let-var-initial-value var)) + (initial-type (lvar-type initial-value))) + (setf (lvar-reoptimize initial-value) nil) + (propagate-from-sets var initial-type)))))) - (derive-node-type node (continuation-type (set-value node))) + (derive-node-type node (make-single-value-type + (lvar-type (set-value node)))) (values)) -;;; Return true if the value of Ref will always be the same (and is +;;; Return true if the value of REF will always be the same (and is ;;; thus legal to substitute.) (defun constant-reference-p (ref) (declare (type ref ref)) @@ -1160,127 +1241,134 @@ ((or constant functional) t) (lambda-var (null (lambda-var-sets leaf))) - (defined-function - (not (eq (defined-function-inlinep leaf) :notinline))) + (defined-fun + (not (eq (defined-fun-inlinep leaf) :notinline))) (global-var (case (global-var-kind leaf) - (:global-function t) - (:constant t)))))) + (:global-function + (let ((name (leaf-source-name leaf))) + (or #-sb-xc-host + (eq (symbol-package (fun-name-block-name name)) + *cl-package*) + (info :function :info name))))))))) ;;; If we have a non-set LET var with a single use, then (if possible) -;;; replace the variable reference's CONT with the arg continuation. -;;; This is inhibited when: -;;; -- CONT has other uses, or -;;; -- CONT receives multiple values, or -;;; -- the reference is in a different environment from the variable, or -;;; -- either continuation has a funky TYPE-CHECK annotation. -;;; -- the continuations have incompatible assertions, so the new asserted type -;;; would be NIL. -;;; -- the var's DEST has a different policy than the ARG's (think safety). +;;; replace the variable reference's LVAR with the arg lvar. ;;; ;;; We change the REF to be a reference to NIL with unused value, and -;;; let it be flushed as dead code. A side-effect of this substitution +;;; let it be flushed as dead code. A side effect of this substitution ;;; is to delete the variable. -(defun substitute-single-use-continuation (arg var) - (declare (type continuation arg) (type lambda-var var)) - (let* ((ref (first (leaf-refs var))) - (cont (node-cont ref)) - (cont-atype (continuation-asserted-type cont)) - (dest (continuation-dest cont))) - (when (and (eq (continuation-use cont) ref) - dest - (not (typep dest '(or creturn exit mv-combination))) - (eq (node-home-lambda ref) - (lambda-home (lambda-var-home var))) - (member (continuation-type-check arg) '(t nil)) - (member (continuation-type-check cont) '(t nil)) - (not (eq (values-type-intersection - cont-atype - (continuation-asserted-type arg)) - *empty-type*)) - (eq (lexenv-policy (node-lexenv dest)) - (lexenv-policy (node-lexenv (continuation-dest arg))))) - (aver (member (continuation-kind arg) - '(:block-start :deleted-block-start :inside-block))) - (assert-continuation-type arg cont-atype) +(defun substitute-single-use-lvar (arg var) + (declare (type lvar arg) (type lambda-var var)) + (binding* ((ref (first (leaf-refs var))) + (lvar (node-lvar ref) :exit-if-null) + (dest (lvar-dest lvar))) + (when (and + ;; Think about (LET ((A ...)) (IF ... A ...)): two + ;; LVAR-USEs should not be met on one path. + (eq (lvar-uses lvar) ref) + (typecase dest + ;; we should not change lifetime of unknown values lvars + (cast + (and (type-single-value-p (lvar-derived-type arg)) + (multiple-value-bind (pdest pprev) + (principal-lvar-end lvar) + (declare (ignore pdest)) + (lvar-single-value-p pprev)))) + (mv-combination + (or (eq (basic-combination-fun dest) lvar) + (and (eq (basic-combination-kind dest) :local) + (type-single-value-p (lvar-derived-type arg))))) + ((or creturn exit) + ;; While CRETURN and EXIT nodes may be known-values, + ;; they have their own complications, such as + ;; substitution into CRETURN may create new tail calls. + nil) + (t + (aver (lvar-single-value-p lvar)) + t)) + (eq (node-home-lambda ref) + (lambda-home (lambda-var-home var)))) (setf (node-derived-type ref) *wild-type*) + (substitute-lvar-uses lvar arg) + (delete-lvar-use ref) (change-ref-leaf ref (find-constant nil)) - (substitute-continuation arg cont) - (reoptimize-continuation arg) + (delete-ref ref) + (unlink-node ref) + (reoptimize-lvar lvar) t))) ;;; Delete a LET, removing the call and bind nodes, and warning about ;;; any unreferenced variables. Note that FLUSH-DEAD-CODE will come ;;; along right away and delete the REF and then the lambda, since we -;;; flush the FUN continuation. -(defun delete-let (fun) - (declare (type clambda fun)) - (aver (member (functional-kind fun) '(:let :mv-let))) - (note-unreferenced-vars fun) - (let ((call (let-combination fun))) +;;; flush the FUN lvar. +(defun delete-let (clambda) + (declare (type clambda clambda)) + (aver (functional-letlike-p clambda)) + (note-unreferenced-vars clambda) + (let ((call (let-combination clambda))) (flush-dest (basic-combination-fun call)) (unlink-node call) - (unlink-node (lambda-bind fun)) - (setf (lambda-bind fun) nil)) + (unlink-node (lambda-bind clambda)) + (setf (lambda-bind clambda) nil)) (values)) ;;; This function is called when one of the arguments to a LET ;;; changes. We look at each changed argument. If the corresponding ;;; variable is set, then we call PROPAGATE-FROM-SETS. Otherwise, we ;;; consider substituting for the variable, and also propagate -;;; derived-type information for the arg to all the Var's refs. +;;; derived-type information for the arg to all the VAR's refs. ;;; ;;; Substitution is inhibited when the arg leaf's derived type isn't a -;;; subtype of the argument's asserted type. This prevents type -;;; checking from being defeated, and also ensures that the best -;;; representation for the variable can be used. +;;; subtype of the argument's leaf type. This prevents type checking +;;; from being defeated, and also ensures that the best representation +;;; for the variable can be used. ;;; ;;; Substitution of individual references is inhibited if the ;;; reference is in a different component from the home. This can only -;;; happen with closures over top-level lambda vars. In such cases, +;;; happen with closures over top level lambda vars. In such cases, ;;; the references may have already been compiled, and thus can't be ;;; retroactively modified. ;;; ;;; If all of the variables are deleted (have no references) when we ;;; are done, then we delete the LET. ;;; -;;; Note that we are responsible for clearing the -;;; Continuation-Reoptimize flags. +;;; Note that we are responsible for clearing the LVAR-REOPTIMIZE +;;; flags. (defun propagate-let-args (call fun) (declare (type combination call) (type clambda fun)) (loop for arg in (combination-args call) and var in (lambda-vars fun) do - (when (and arg (continuation-reoptimize arg)) - (setf (continuation-reoptimize arg) nil) + (when (and arg (lvar-reoptimize arg)) + (setf (lvar-reoptimize arg) nil) (cond - ((lambda-var-sets var) - (propagate-from-sets var (continuation-type arg))) - ((let ((use (continuation-use arg))) - (when (ref-p use) - (let ((leaf (ref-leaf use))) - (when (and (constant-reference-p use) - (values-subtypep (leaf-type leaf) - (continuation-asserted-type arg))) - (propagate-to-refs var (continuation-type arg)) - (let ((this-comp (block-component (node-block use)))) - (substitute-leaf-if - #'(lambda (ref) - (cond ((eq (block-component (node-block ref)) - this-comp) - t) - (t - (aver (eq (functional-kind (lambda-home fun)) - :top-level)) - nil))) - leaf var)) - t))))) - ((and (null (rest (leaf-refs var))) - (not *byte-compiling*) - (substitute-single-use-continuation arg var))) - (t - (propagate-to-refs var (continuation-type arg)))))) - - (when (every #'null (combination-args call)) + ((lambda-var-sets var) + (propagate-from-sets var (lvar-type arg))) + ((let ((use (lvar-uses arg))) + (when (ref-p use) + (let ((leaf (ref-leaf use))) + (when (and (constant-reference-p use) + (csubtypep (leaf-type leaf) + ;; (NODE-DERIVED-TYPE USE) would + ;; be better -- APD, 2003-05-15 + (leaf-type var))) + (propagate-to-refs var (lvar-type arg)) + (let ((use-component (node-component use))) + (prog1 (substitute-leaf-if + (lambda (ref) + (cond ((eq (node-component ref) use-component) + t) + (t + (aver (lambda-toplevelish-p (lambda-home fun))) + nil))) + leaf var))) + t))))) + ((and (null (rest (leaf-refs var))) + (substitute-single-use-lvar arg var))) + (t + (propagate-to-refs var (lvar-type arg)))))) + + (when (every #'not (combination-args call)) (delete-let fun)) (values)) @@ -1293,44 +1381,43 @@ ;;; If the function has an XEP, then we don't do anything, since we ;;; won't discover anything. ;;; -;;; We can clear the Continuation-Reoptimize flags for arguments in -;;; all calls corresponding to changed arguments in Call, since the -;;; only use in IR1 optimization of the Reoptimize flag for local call -;;; args is right here. +;;; We can clear the LVAR-REOPTIMIZE flags for arguments in all calls +;;; corresponding to changed arguments in CALL, since the only use in +;;; IR1 optimization of the REOPTIMIZE flag for local call args is +;;; right here. (defun propagate-local-call-args (call fun) (declare (type combination call) (type clambda fun)) - (unless (or (functional-entry-function fun) + (unless (or (functional-entry-fun fun) (lambda-optional-dispatch fun)) (let* ((vars (lambda-vars fun)) - (union (mapcar #'(lambda (arg var) - (when (and arg - (continuation-reoptimize arg) - (null (basic-var-sets var))) - (continuation-type arg))) + (union (mapcar (lambda (arg var) + (when (and arg + (lvar-reoptimize arg) + (null (basic-var-sets var))) + (lvar-type arg))) (basic-combination-args call) vars)) - (this-ref (continuation-use (basic-combination-fun call)))) + (this-ref (lvar-use (basic-combination-fun call)))) (dolist (arg (basic-combination-args call)) (when arg - (setf (continuation-reoptimize arg) nil))) + (setf (lvar-reoptimize arg) nil))) (dolist (ref (leaf-refs fun)) - (let ((dest (continuation-dest (node-cont ref)))) + (let ((dest (node-dest ref))) (unless (or (eq ref this-ref) (not dest)) (setq union - (mapcar #'(lambda (this-arg old) - (when old - (setf (continuation-reoptimize this-arg) nil) - (type-union (continuation-type this-arg) old))) + (mapcar (lambda (this-arg old) + (when old + (setf (lvar-reoptimize this-arg) nil) + (type-union (lvar-type this-arg) old))) (basic-combination-args dest) union))))) - (mapc #'(lambda (var type) - (when type - (propagate-to-refs var type))) - vars union))) + (loop for var in vars + and type in union + when type do (propagate-to-refs var type)))) (values)) @@ -1351,55 +1438,51 @@ (defun ir1-optimize-mv-combination (node) (ecase (basic-combination-kind node) (:local - (let ((fun-cont (basic-combination-fun node))) - (when (continuation-reoptimize fun-cont) - (setf (continuation-reoptimize fun-cont) nil) + (let ((fun-lvar (basic-combination-fun node))) + (when (lvar-reoptimize fun-lvar) + (setf (lvar-reoptimize fun-lvar) nil) (maybe-let-convert (combination-lambda node)))) - (setf (continuation-reoptimize (first (basic-combination-args node))) nil) + (setf (lvar-reoptimize (first (basic-combination-args node))) nil) (when (eq (functional-kind (combination-lambda node)) :mv-let) (unless (convert-mv-bind-to-let node) (ir1-optimize-mv-bind node)))) (:full (let* ((fun (basic-combination-fun node)) - (fun-changed (continuation-reoptimize fun)) + (fun-changed (lvar-reoptimize fun)) (args (basic-combination-args node))) (when fun-changed - (setf (continuation-reoptimize fun) nil) - (let ((type (continuation-type fun))) - (when (function-type-p type) - (derive-node-type node (function-type-returns type)))) - (maybe-terminate-block node nil) - (let ((use (continuation-use fun))) + (setf (lvar-reoptimize fun) nil) + (let ((type (lvar-type fun))) + (when (fun-type-p type) + (derive-node-type node (fun-type-returns type)))) + (maybe-terminate-block node nil) + (let ((use (lvar-uses fun))) (when (and (ref-p use) (functional-p (ref-leaf use))) (convert-call-if-possible use node) (when (eq (basic-combination-kind node) :local) (maybe-let-convert (ref-leaf use)))))) (unless (or (eq (basic-combination-kind node) :local) - (eq (continuation-function-name fun) '%throw)) + (eq (lvar-fun-name fun) '%throw)) (ir1-optimize-mv-call node)) (dolist (arg args) - (setf (continuation-reoptimize arg) nil)))) + (setf (lvar-reoptimize arg) nil)))) (:error)) (values)) -;;; Propagate derived type info from the values continuation to the -;;; vars. +;;; Propagate derived type info from the values lvar to the vars. (defun ir1-optimize-mv-bind (node) (declare (type mv-combination node)) - (let ((arg (first (basic-combination-args node))) - (vars (lambda-vars (combination-lambda node)))) - (multiple-value-bind (types nvals) - (values-types (continuation-derived-type arg)) - (unless (eq nvals :unknown) - (mapc #'(lambda (var type) - (if (basic-var-sets var) - (propagate-from-sets var type) - (propagate-to-refs var type))) - vars - (append types - (make-list (max (- (length vars) nvals) 0) - :initial-element (specifier-type 'null)))))) - (setf (continuation-reoptimize arg) nil)) + (let* ((arg (first (basic-combination-args node))) + (vars (lambda-vars (combination-lambda node))) + (n-vars (length vars)) + (types (values-type-in (lvar-derived-type arg) + n-vars))) + (loop for var in vars + and type in types + do (if (basic-var-sets var) + (propagate-from-sets var type) + (propagate-to-refs var type))) + (setf (lvar-reoptimize arg) nil)) (values)) ;;; If possible, convert a general MV call to an MV-BIND. We can do @@ -1432,31 +1515,31 @@ (defun ir1-optimize-mv-call (node) (let ((fun (basic-combination-fun node)) (*compiler-error-context* node) - (ref (continuation-use (basic-combination-fun node))) + (ref (lvar-uses (basic-combination-fun node))) (args (basic-combination-args node))) (unless (and (ref-p ref) (constant-reference-p ref) - args (null (rest args))) + (singleton-p args)) (return-from ir1-optimize-mv-call)) (multiple-value-bind (min max) - (function-type-nargs (continuation-type fun)) + (fun-type-nargs (lvar-type fun)) (let ((total-nvals (multiple-value-bind (types nvals) - (values-types (continuation-derived-type (first args))) + (values-types (lvar-derived-type (first args))) (declare (ignore types)) (if (eq nvals :unknown) nil nvals)))) (when total-nvals (when (and min (< total-nvals min)) - (compiler-warning + (compiler-warn "MULTIPLE-VALUE-CALL with ~R values when the function expects ~ at least ~R." total-nvals min) (setf (basic-combination-kind node) :error) (return-from ir1-optimize-mv-call)) (when (and max (> total-nvals max)) - (compiler-warning + (compiler-warn "MULTIPLE-VALUE-CALL with ~R values when the function expects ~ at most ~R." total-nvals max) @@ -1464,12 +1547,12 @@ (return-from ir1-optimize-mv-call))) (let ((count (cond (total-nvals) - ((and (policy node (zerop safety)) + ((and (policy node (zerop verify-arg-count)) (eql min max)) min) (t nil)))) (when count - (with-ir1-environment node + (with-ir1-environment-from-node node (let* ((dums (make-gensym-list count)) (ignore (gensym)) (fun (ir1-convert-lambda @@ -1478,7 +1561,7 @@ (funcall ,(ref-leaf ref) ,@dums))))) (change-ref-leaf ref fun) (aver (eq (basic-combination-kind node) :full)) - (local-call-analyze *current-component*) + (locall-analyze-component *current-component*) (aver (eq (basic-combination-kind node) :local))))))))) (values)) @@ -1495,14 +1578,13 @@ ;;; What we actually do is convert the VALUES combination into a ;;; normal LET combination calling the original :MV-LET lambda. If ;;; there are extra args to VALUES, discard the corresponding -;;; continuations. If there are insufficient args, insert references -;;; to NIL. +;;; lvars. If there are insufficient args, insert references to NIL. (defun convert-mv-bind-to-let (call) (declare (type mv-combination call)) (let* ((arg (first (basic-combination-args call))) - (use (continuation-use arg))) + (use (lvar-uses arg))) (when (and (combination-p use) - (eq (continuation-function-name (combination-fun use)) + (eq (lvar-fun-name (combination-fun use)) 'values)) (let* ((fun (combination-lambda call)) (vars (lambda-vars fun)) @@ -1513,30 +1595,34 @@ (mapc #'flush-dest (subseq vals nvars)) (setq vals (subseq vals 0 nvars))) ((< nvals nvars) - (with-ir1-environment use + (with-ir1-environment-from-node use (let ((node-prev (node-prev use))) (setf (node-prev use) nil) - (setf (continuation-next node-prev) nil) + (setf (ctran-next node-prev) nil) (collect ((res vals)) - (loop as cont = (make-continuation use) - and prev = node-prev then cont - repeat (- nvars nvals) - do (reference-constant prev cont nil) - (res cont)) - (setq vals (res))) - (prev-link use (car (last vals))))))) + (loop for count below (- nvars nvals) + for prev = node-prev then ctran + for ctran = (make-ctran) + and lvar = (make-lvar use) + do (reference-constant prev ctran lvar nil) + (res lvar) + finally (link-node-to-previous-ctran + use ctran)) + (setq vals (res))))))) (setf (combination-args use) vals) (flush-dest (combination-fun use)) - (let ((fun-cont (basic-combination-fun call))) - (setf (continuation-dest fun-cont) use) - (setf (combination-fun use) fun-cont)) + (let ((fun-lvar (basic-combination-fun call))) + (setf (lvar-dest fun-lvar) use) + (setf (combination-fun use) fun-lvar) + (flush-lvar-externally-checkable-type fun-lvar)) (setf (combination-kind use) :local) (setf (functional-kind fun) :let) (flush-dest (first (basic-combination-args call))) (unlink-node call) (when vals - (reoptimize-continuation (first vals))) - (propagate-to-args use fun)) + (reoptimize-lvar (first vals))) + (propagate-to-args use fun) + (reoptimize-call use)) t))) ;;; If we see: @@ -1547,19 +1633,24 @@ ;;; ;;; In implementation, this is somewhat similar to ;;; CONVERT-MV-BIND-TO-LET. We grab the args of LIST and make them -;;; args of the VALUES-LIST call, flushing the old argument -;;; continuation (allowing the LIST to be flushed.) +;;; args of the VALUES-LIST call, flushing the old argument lvar +;;; (allowing the LIST to be flushed.) +;;; +;;; FIXME: Thus we lose possible type assertions on (LIST ...). (defoptimizer (values-list optimizer) ((list) node) - (let ((use (continuation-use list))) + (let ((use (lvar-uses list))) (when (and (combination-p use) - (eq (continuation-function-name (combination-fun use)) + (eq (lvar-fun-name (combination-fun use)) 'list)) - (change-ref-leaf (continuation-use (combination-fun node)) - (find-free-function 'values "in a strange place")) + + ;; FIXME: VALUES might not satisfy an assertion on NODE-LVAR. + (change-ref-leaf (lvar-uses (combination-fun node)) + (find-free-fun 'values "in a strange place")) (setf (combination-kind node) :full) (let ((args (combination-args use))) (dolist (arg args) - (setf (continuation-dest arg) node)) + (setf (lvar-dest arg) node) + (flush-lvar-externally-checkable-type arg)) (setf (combination-args use) nil) (flush-dest list) (setf (combination-args node) args)) @@ -1569,13 +1660,91 @@ ;;; to a PROG1. This allows the computation of the additional values ;;; to become dead code. (deftransform values ((&rest vals) * * :node node) - (when (typep (continuation-dest (node-cont node)) - '(or creturn exit mv-combination)) + (unless (lvar-single-value-p (node-lvar node)) (give-up-ir1-transform)) (setf (node-derived-type node) *wild-type*) + (principal-lvar-single-valuify (node-lvar node)) (if vals (let ((dummies (make-gensym-list (length (cdr vals))))) `(lambda (val ,@dummies) (declare (ignore ,@dummies)) val)) nil)) + +;;; TODO: +;;; - CAST chains; +(defun ir1-optimize-cast (cast &optional do-not-optimize) + (declare (type cast cast)) + (let* ((value (cast-value cast)) + (value-type (lvar-derived-type value)) + (atype (cast-asserted-type cast)) + (int (values-type-intersection value-type atype))) + (derive-node-type cast int) + (when (eq int *empty-type*) + (unless (eq value-type *empty-type*) + + ;; FIXME: Do it in one step. + (filter-lvar + value + `(multiple-value-call #'list 'dummy)) + (filter-lvar + (cast-value cast) + ;; FIXME: Derived type. + `(%compile-time-type-error 'dummy + ',(type-specifier atype) + ',(type-specifier value-type))) + ;; KLUDGE: FILTER-LVAR does not work for non-returning + ;; functions, so we declare the return type of + ;; %COMPILE-TIME-TYPE-ERROR to be * and derive the real type + ;; here. + (setq value (cast-value cast)) + (derive-node-type (lvar-uses value) *empty-type*) + (maybe-terminate-block (lvar-uses value) nil) + ;; FIXME: Is it necessary? + (aver (null (block-pred (node-block cast)))) + (setf (block-delete-p (node-block cast)) t) + (return-from ir1-optimize-cast))) + (when (eq (node-derived-type cast) *empty-type*) + (maybe-terminate-block cast nil)) + + (when (not do-not-optimize) + (let ((lvar (node-lvar cast))) + (when (values-subtypep value-type (cast-asserted-type cast)) + (delete-filter cast lvar value) + (when lvar + (reoptimize-lvar lvar) + (when (lvar-single-value-p lvar) + (note-single-valuified-lvar lvar))) + (return-from ir1-optimize-cast t)) + + (when (and (listp (lvar-uses value)) + lvar) + ;; Pathwise removing of CAST + (let ((ctran (node-next cast)) + (dest (lvar-dest lvar)) + next-block) + (collect ((merges)) + (do-uses (use value) + (when (and (values-subtypep (node-derived-type use) atype) + (immediately-used-p value use)) + (unless next-block + (when ctran (ensure-block-start ctran)) + (setq next-block (first (block-succ (node-block cast))))) + (%delete-lvar-use use) + (add-lvar-use use lvar) + (unlink-blocks (node-block use) (node-block cast)) + (link-blocks (node-block use) next-block) + (when (and (return-p dest) + (basic-combination-p use) + (eq (basic-combination-kind use) :local)) + (merges use)))) + (dolist (use (merges)) + (merge-tail-sets use))))))) + + (when (and (cast-%type-check cast) + (values-subtypep value-type + (cast-type-to-check cast))) + (setf (cast-%type-check cast) nil))) + + (unless do-not-optimize + (setf (node-reoptimize cast) nil)))