X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1opt.lisp;h=95b4357e81dc362ebbd56970c9670e3653075403;hb=771b864c8f32af7734bc0550aeaf1539fc4df194;hp=d585c2076d9903d6f5a6480fbda9488da80c3f0b;hpb=eb360c8c93092c0c167458b4aefbe52479848527;p=sbcl.git diff --git a/src/compiler/ir1opt.lisp b/src/compiler/ir1opt.lisp index d585c20..95b4357 100644 --- a/src/compiler/ir1opt.lisp +++ b/src/compiler/ir1opt.lisp @@ -18,178 +18,130 @@ ;;;; interface for obtaining results of constant folding -;;; Return true for a CONTINUATION whose sole use is a reference to a +;;; Return true for an LVAR whose sole use is a reference to a ;;; constant leaf. -(defun constant-continuation-p (thing) - (and (continuation-p thing) - (let ((use (continuation-use thing))) - (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)))) +(defun constant-lvar-p (thing) + (declare (type (or lvar null) 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)) - ((and (values-subtypep proven (specifier-type 'function)) - (values-subtypep asserted (specifier-type 'function))) - ;; It's physically impossible for a runtime type check to - ;; distinguish between the various subtypes of FUNCTION, so - ;; it'd be pointless to do more type checks here. - (setf (continuation-%type-check cont) nil) - (setf (continuation-%derived-type cont) - ;; FIXME: This should depend on optimization - ;; policy. This is for SPEED > SAFETY: - #+nil (values-type-intersection asserted proven) - ;; and this is for SAFETY >= SPEED: - #-nil 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))) - -;;; If CONT is an argument of a function, return a type which the -;;; function checks CONT for. -#!-sb-fluid (declaim (inline continuation-externally-checkable-type)) -(defun continuation-externally-checkable-type (cont) - (or (continuation-%externally-checkable-type cont) - (%continuation-%externally-checkable-type cont))) -(defun %continuation-%externally-checkable-type (cont) - (declare (type continuation cont)) - (let ((dest (continuation-dest cont))) - (if (not (and dest (combination-p dest))) - ;; TODO: MV-COMBINATION - (setf (continuation-%externally-checkable-type cont) *wild-type*) - (let* ((fun (combination-fun dest)) - (args (combination-args dest)) - (fun-type (continuation-type fun))) - (setf (continuation-%externally-checkable-type fun) *wild-type*) - (if (or (not (fun-type-p fun-type)) - ;; FUN-TYPE might be (AND FUNCTION (SATISFIES ...)). - (fun-type-wild-args fun-type)) - (progn (dolist (arg args) - (when arg - (setf (continuation-%externally-checkable-type arg) - *wild-type*))) - *wild-type*) - (let* ((arg-types (append (fun-type-required fun-type) - (fun-type-optional fun-type) - (let ((rest (list (or (fun-type-rest fun-type) - *wild-type*)))) - (setf (cdr rest) rest))))) - ;; TODO: &KEY - (loop - for arg of-type continuation in args - and type of-type ctype in arg-types - do (when arg - (setf (continuation-%externally-checkable-type arg) - type))) - (continuation-%externally-checkable-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)) +(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 @@ -198,12 +150,13 @@ ;;; ;;; 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*) @@ -211,77 +164,48 @@ (let ((*compiler-error-context* node)) (compiler-warn "New inferred type ~S conflicts with old type:~ - ~% ~S~%*** possible internal error? Please report this." + ~% ~S~%*** possible internal error? Please report this." (type-specifier rtype) (type-specifier node-type)))) (setf (node-derived-type node) int) + ;; If the new type consists of only one object, replace the + ;; node with a constant reference. (when (and (ref-p node) - (member-type-p int) - (null (rest (member-type-members int))) (lambda-var-p (ref-leaf node))) - (change-ref-leaf node (find-constant (first (member-type-members int))))) - (reoptimize-continuation (node-cont node)))))) - (values)) - -(defun set-continuation-type-assertion (cont atype ctype) - (declare (type continuation cont) (type ctype atype ctype)) - (when (eq atype *wild-type*) - (return-from set-continuation-type-assertion)) - (let* ((old-atype (continuation-asserted-type cont)) - (old-ctype (continuation-type-to-check cont)) - (new-atype (values-type-intersection old-atype atype)) - (new-ctype (values-type-intersection old-ctype ctype))) - (when (or (type/= old-atype new-atype) - (type/= old-ctype new-ctype)) - (setf (continuation-asserted-type cont) new-atype) - (setf (continuation-type-to-check cont) new-ctype) - (do-uses (node cont) - (setf (block-attributep (block-flags (node-block node)) - type-check type-asserted) - t)) - (reoptimize-continuation cont))) + (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 policy) - (declare (type continuation cont) (type ctype type)) - (when (eq type *wild-type*) - (return-from assert-continuation-type)) - (set-continuation-type-assertion cont type (maybe-weaken-check type policy))) - -;;; 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 fun-type type)) - (derive-node-type call (fun-type-returns type)) - (let ((args (combination-args call)) - (policy (lexenv-policy (node-lexenv call)))) - (dolist (req (fun-type-required type)) - (when (null args) (return-from assert-call-type)) - (let ((arg (pop args))) - (assert-continuation-type arg req policy))) - (dolist (opt (fun-type-optional type)) - (when (null args) (return-from assert-call-type)) - (let ((arg (pop args))) - (assert-continuation-type arg opt policy))) - - (let ((rest (fun-type-rest type))) - (when rest - (dolist (arg args) - (assert-continuation-type arg rest policy)))) - - (dolist (key (fun-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) - policy)))))) - (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)))))) + ;;;; IR1-OPTIMIZE @@ -292,55 +216,55 @@ (defun ir1-optimize (component) (declare (type component component)) (setf (component-reoptimize component) nil) - (do-blocks (block component) - (cond - ;; 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 (and succ (null (rest succ))) - (return))) - - (let ((last (block-last block))) - (typecase last - (cif - (if (memq (continuation-type-check (if-test last)) - '(nil :deleted)) - ;; FIXME: Remove the test above when the bug 203 - ;; will be fixed. - (progn - (flush-dest (if-test last)) - (when (unlink-node last) - (return))) + (loop with block = (block-next (component-head component)) + with tail = (component-tail component) + for last-block = block + until (eq block tail) + do (cond + ;; 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-lazily block) + (setq block (clean-component component 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) + (setq block (clean-component component 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))) - (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-reoptimize block) (block-component block)) + (aver (not (block-delete-p block))) + (ir1-optimize-block block)) - (cond ((block-delete-p block) - (delete-block block)) - ((and (block-flush-p block) (block-component block)) - (flush-dead-code block)))))) + (cond ((and (block-delete-p block) (block-component block)) + (setq block (clean-component component block))) + ((and (block-flush-p block) (block-component block)) + (flush-dead-code block))))) + do (when (eq block last-block) + (setq block (block-next block)))) (values)) @@ -356,7 +280,7 @@ ;; 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) @@ -380,16 +304,14 @@ (ir1-optimize-mv-combination node)) (exit ;; 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. + ;; 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)) @@ -398,78 +320,59 @@ (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 (;; We cannot combine with a successor block if: - (or - ;; The successor has more than one predecessor. - (rest (block-pred next)) - ;; The last node's CONT is also used somewhere else. - (not (eq (continuation-use last-cont) last)) - ;; 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) - ;; Joining is easy when the successor's START - ;; continuation is the same from our LAST's CONT. - ((eq last-cont next-cont) - (join-blocks block next) - t) - ;; If they differ, then we can still join when the last - ;; continuation has no next and the next continuation - ;; has no uses. - ((and (null (block-start-uses next)) - (eq (continuation-kind last-cont) :inside-block)) - ;; In this case, we replace the next - ;; continuation with the last before joining the blocks. - (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))) + ;; Stack analysis phase wants ENTRY to start a block... + (entry-p (block-start-node next)) + (let ((last (block-last block))) + (and (valued-node-p last) + (awhen (node-lvar last) + (or + ;; ... and a DX-allocator to end a block. + (lvar-dynamic-extent it) + ;; FIXME: This is a partial workaround for bug 303. + (consp (lvar-uses it))))))) + 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) @@ -488,15 +391,17 @@ ;;; variable has no references. (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 :restart-p t) + (unless lvar (typecase node (ref (delete-ref node) (unlink-node node)) (combination - (let ((info (combination-kind node))) - (when (fun-info-p info) + (let ((kind (combination-kind node)) + (info (combination-fun-info node))) + (when (and (eq kind :known) (fun-info-p info)) (let ((attr (fun-info-attributes info))) (when (and (not (ir1-attributep attr call)) ;; ### For now, don't delete potentially @@ -505,20 +410,7 @@ ;; functional args to determine if they have ;; any side effects. (if (policy node (= safety 3)) - (and (ir1-attributep attr flushable) - (every (lambda (arg) - ;; FIXME: when bug 203 - ;; will be fixed, remove - ;; this check - (member (continuation-type-check arg) - '(nil :deleted))) - (basic-combination-args node)) - (valid-fun-use node - (info :function :type - (leaf-source-name (ref-leaf (continuation-use (basic-combination-fun node))))) - :result-test #'always-subtypep - :lossage-fun nil - :unwinnage-fun nil)) + (ir1-attributep attr flushable) (ir1-attributep attr unsafely-flushable))) (flush-combination node)))))) (mv-combination @@ -541,10 +433,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 @@ -569,20 +464,26 @@ (let ((result (return-result node))) (collect ((use-union *empty-type* values-type-union)) (do-uses (use result) - (cond ((and (basic-combination-p use) - (eq (basic-combination-kind use) :local)) - (aver (eq (lambda-tail-set (node-home-lambda use)) - (lambda-tail-set (combination-lambda use)))) - (when (combination-p use) - (when (nth-value 1 (maybe-convert-tail-local-call use)) - (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 ((use-home (node-home-lambda use))) + (cond ((or (eq (functional-kind use-home) :deleted) + (block-delete-p (node-block use)))) + ((and (basic-combination-p use) + (eq (basic-combination-kind use) :local)) + (aver (eq (lambda-tail-set use-home) + (lambda-tail-set (combination-lambda use)))) + (when (combination-p use) + (when (nth-value 1 (maybe-convert-tail-local-call use)) + (return-from find-result-type t)))) + (t + (use-union (node-derived-type use)))))) + (let ((int + ;; (values-type-intersection + ;; (continuation-asserted-type result) ; FIXME -- APD, 2002-01-26 + (use-union) + ;; ) + )) (setf (return-result-type node) int)))) - (values)) + nil) ;;; Do stuff to realize that something has changed about the value ;;; delivered to a return node. Since we consider the return values of @@ -593,27 +494,30 @@ ;;; ;;; 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-funs tails))) - (collect ((res *empty-type* values-type-union)) - (dolist (fun funs) - (let ((return (lambda-return fun))) - (when return - (when (node-reoptimize return) - (setf (node-reoptimize return) nil) - (find-result-type return)) - (res (return-result-type return))))) - - (when (type/= (res) (tail-set-type tails)) - (setf (tail-set-type tails) (res)) - (dolist (fun (tail-set-funs tails)) - (dolist (ref (leaf-refs fun)) - (reoptimize-continuation (node-cont ref))))))) + (tagbody + :restart + (let* ((tails (lambda-tail-set (return-lambda node))) + (funs (tail-set-funs tails))) + (collect ((res *empty-type* values-type-union)) + (dolist (fun funs) + (let ((return (lambda-return fun))) + (when return + (when (node-reoptimize return) + (setf (node-reoptimize return) nil) + (when (find-result-type return) + (go :restart))) + (res (return-result-type return))))) + + (when (type/= (res) (tail-set-type tails)) + (setf (tail-set-type tails) (res)) + (dolist (fun (tail-set-funs tails)) + (dolist (ref (leaf-refs fun)) + (reoptimize-lvar (node-lvar ref)))))))) (values)) @@ -628,33 +532,29 @@ (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))))) - - (when (memq (continuation-type-check test) - '(nil :deleted)) - ;; FIXME: Remove the test above when the bug 203 will be fixed. - (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 victim - (flush-dest test) - (when (rest (block-succ block)) - (unlink-blocks block victim)) - (setf (component-reanalyze (node-component node)) t) - (unlink-node 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 (node-component node)) t) + (unlink-node node)))) (values)) ;;; Create a new copy of an IF node that tests the value of the node @@ -679,21 +579,19 @@ (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))) - (link-node-to-previous-continuation new-node new-cont) - (setf (continuation-dest new-cont) new-node) - (setf (continuation-%externally-checkable-type new-cont) nil) - (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) @@ -702,8 +600,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)) @@ -715,7 +613,7 @@ ;;; anything, since there is nothing to be done. ;;; -- 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. @@ -728,23 +626,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 @@ -755,34 +644,48 @@ ;;; 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-fun-change node)) + (when (lvar-reoptimize (basic-combination-fun node)) + (propagate-fun-change node) + (maybe-terminate-block node nil)) (let ((args (basic-combination-args node)) - (kind (basic-combination-kind node))) - (case kind + (kind (basic-combination-kind node)) + (info (basic-combination-fun-info node))) + (ecase kind (:local (let ((fun (combination-lambda node))) (if (eq (functional-kind fun) :let) (propagate-let-args node fun) (propagate-local-call-args node fun)))) - ((:full :error) + (:error (dolist (arg args) (when arg - (setf (continuation-reoptimize arg) nil)))) - (t + (setf (lvar-reoptimize arg) nil)))) + (:full (dolist (arg args) (when arg - (setf (continuation-reoptimize arg) nil))) + (setf (lvar-reoptimize arg) nil))) + (when info + (let ((fun (fun-info-derive-type info))) + (when fun + (let ((res (funcall fun node))) + (when res + (derive-node-type node (coerce-to-values res)) + (maybe-terminate-block node nil))))))) + (:known + (aver info) + (dolist (arg args) + (when arg + (setf (lvar-reoptimize arg) nil))) - (let ((attr (fun-info-attributes kind))) + (let ((attr (fun-info-attributes info))) (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 @@ -792,24 +695,28 @@ ;; cross-compiler can't fold it because the ;; cross-compiler doesn't know how to evaluate it. #+sb-xc-host - (fboundp (combination-fun-source-name node))) + (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 (fun-info-derive-type kind))) + (let ((fun (fun-info-derive-type info))) (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 (fun-info-optimizer kind))) + (let ((fun (fun-info-optimizer info))) (unless (and fun (funcall fun node)) - (dolist (x (fun-info-transforms kind)) - #!+sb-show + (dolist (x (fun-info-transforms info)) + #!+sb-show (when *show-transforms-p* - (let* ((cont (basic-combination-fun node)) - (fname (continuation-fun-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 @@ -819,54 +726,53 @@ (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 [FIXME: What does this mean? Except -;;; during IR1 conversion? What about IR1 optimization?], 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-converting-not-optimizing-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)) + (declare (ignore lvar)) + (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-converting-not-optimizing-p - (eq (continuation-kind cont) :deleted)))) - (eq (node-derived-type call) *empty-type*)) + (when (eq (node-derived-type node) *empty-type*) (cond (ir1-converting-not-optimizing-p - (delete-continuation-use call) (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 @@ -886,23 +792,19 @@ ;;; ;;; We return the leaf referenced (NIL if not a leaf) and the ;;; FUN-INFO assigned. -;;; -;;; FIXME: The IR1-CONVERTING-NOT-OPTIMIZING-P argument is what the -;;; old CMU CL code called IR1-P, without explanation. My (WHN -;;; 2002-01-09) tentative understanding of it is that we can call this -;;; operation either in initial IR1 conversion or in later IR1 -;;; optimization, and it tells which is which. But it would be good -;;; for someone who really understands it to check whether this is -;;; really right. (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 (defined-fun-p leaf) (defined-fun-inlinep leaf) :no-chance))) (cond - ((eq inlinep :notinline) (values nil nil)) + ((eq inlinep :notinline) + (let ((info (info :function :info (leaf-source-name leaf)))) + (when info + (setf (basic-combination-fun-info call) info)) + (values nil nil))) ((not (and (global-var-p leaf) (eq (global-var-kind leaf) :global-function))) (values leaf nil)) @@ -920,10 +822,11 @@ ;; called semi-inlining? A more descriptive name would ;; be nice. -- WHN 2002-01-07 (frob () - (let ((res (ir1-convert-lambda-for-defun - (defined-fun-inline-expansion leaf) - leaf t - #'ir1-convert-inline-lambda))) + (let ((res (let ((*allow-instrumenting* t)) + (ir1-convert-lambda-for-defun + (defined-fun-inline-expansion leaf) + leaf t + #'ir1-convert-inline-lambda)))) (setf (defined-fun-functional leaf) res) (change-ref-leaf ref res)))) (if ir1-converting-not-optimizing-p @@ -932,12 +835,15 @@ (frob) (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 ((info (info :function :info (leaf-source-name leaf)))) (if info - (values leaf (setf (basic-combination-kind call) info)) + (values leaf + (progn + (setf (basic-combination-kind call) :known) + (setf (basic-combination-fun-info call) info))) (values leaf nil))))))) ;;; Check whether CALL satisfies TYPE. If so, apply the type to the @@ -956,7 +862,7 @@ (recognize-known-call call ir1-converting-not-optimizing-p)) ((valid-fun-use call type :argument-test #'always-subtypep - :result-test #'always-subtypep + :result-test nil ;; KLUDGE: Common Lisp is such a dynamic ;; language that all we can do here in ;; general is issue a STYLE-WARNING. It @@ -974,7 +880,7 @@ ;; issue a full WARNING if the call ;; violates a DECLAIM FTYPE. :lossage-fun #'compiler-style-warn - :unwinnage-fun #'compiler-note) + :unwinnage-fun #'compiler-notify) (assert-call-type call type) (maybe-terminate-block call ir1-converting-not-optimizing-p) (recognize-known-call call ir1-converting-not-optimizing-p)) @@ -992,8 +898,8 @@ (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))) @@ -1002,37 +908,31 @@ (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)) - ((and (leaf-has-source-name-p leaf) + ((and (global-var-p leaf) + (eq (global-var-kind leaf) :global-function) + (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 ((dest (continuation-dest (node-cont call)))) - (and dest (not (if-p dest))))))) - ;; FIXME: This SYMBOLP is part of a literal - ;; translation of a test in the old CMU CL - ;; source, and it's not quite clear what - ;; the old source meant. Did it mean "has a - ;; valid name"? Or did it mean "is an - ;; ordinary function name, not a SETF - ;; function"? Either way, the old CMU CL - ;; code probably didn't deal with SETF - ;; functions correctly, and neither does - ;; this new SBCL code, and that should be fixed. - (when (symbolp (leaf-source-name leaf)) - (let ((dummies (make-gensym-list - (length (combination-args call))))) - (transform-call call - `(lambda ,dummies - (,(leaf-source-name leaf) - ,@dummies)) - (leaf-source-name leaf)))))))))) + (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 @@ -1068,7 +968,7 @@ (policy node (> speed inhibit-warnings)))) (*compiler-error-context* node)) (cond ((or (not constrained) - (valid-fun-use node type :strict-result t)) + (valid-fun-use node type)) (multiple-value-bind (severity args) (catch 'give-up-ir1-transform (transform-call node @@ -1082,7 +982,7 @@ (:aborted (setf (combination-kind node) :error) (when args - (apply #'compiler-warn args)) + (apply #'warn args)) (remhash node table) nil) (:failure @@ -1106,7 +1006,7 @@ 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 @@ -1189,11 +1089,10 @@ (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 (continuation-use (combination-fun call)))) + :debug-name (debug-namify "LAMBDA-inlined " + source-name + ""))) + (ref (lvar-use (combination-fun call)))) (change-ref-leaf ref new-fun) (setf (combination-kind call) :full) (locall-analyze-component *current-component*)))) @@ -1206,17 +1105,8 @@ ;;; ;;; If there is more than one value, then we transform the call into a ;;; VALUES form. -;;; -;;; An old commentary also said: -;;; -;;; 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. -;;; -;;; This seems to be more efficient, than the current code. Maybe we -;;; should really implement it? -- APD, 2002-12-23 (defun constant-fold-call (call) - (let ((args (mapcar #'continuation-value (combination-args call))) + (let ((args (mapcar #'lvar-value (combination-args call))) (fun-name (combination-fun-source-name call))) (multiple-value-bind (values win) (careful-call fun-name @@ -1257,19 +1147,18 @@ "constant folding") (cond ((not win) (setf (combination-kind call) :error)) - ((and (proper-list-of-length-p values 1) - (eq (continuation-kind (node-cont call)) :inside-block)) + ((and (proper-list-of-length-p values 1)) (with-ir1-environment-from-node call - (let* ((cont (node-cont call)) - (next (continuation-next cont)) - (prev (make-continuation))) - (delete-continuation-use call) - (add-continuation-use call prev) - (reference-constant prev cont (first values)) - (setf (continuation-next cont) next) - ;; FIXME: type checking? - (reoptimize-continuation cont) - (reoptimize-continuation prev) + (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 @@ -1294,21 +1183,85 @@ (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) + (eq (combination-kind set-use) :known) + (fun-info-p (combination-fun-info set-use)) + (not (node-to-be-deleted-p 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)) - (let ((type (continuation-type (set-value set)))) + (let ((type (lvar-type (set-value set)))) (res type) (when (node-reoptimize set) - (derive-node-type set type) + (derive-node-type set (make-single-value-type type)) (setf (node-reoptimize set) nil)))) - (propagate-to-refs var (res))) + (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 @@ -1320,11 +1273,13 @@ (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 @@ -1348,52 +1303,58 @@ (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 ;;; 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)) - (cont-ctype (continuation-type-to-check cont)) - (dest (continuation-dest cont))) - (when (and (eq (continuation-use cont) ref) - dest - (continuation-single-value-p cont) - (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))) - (set-continuation-type-assertion arg cont-atype cont-ctype) +(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. Another problem + ;; is with dynamic-extent. + (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 + ;; Really it is (EQ (LVAR-USES LVAR) REF): + t) + (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. +;;; flush the FUN lvar. (defun delete-let (clambda) (declare (type clambda clambda)) (aver (functional-letlike-p clambda)) @@ -1403,6 +1364,9 @@ (unlink-node call) (unlink-node (lambda-bind clambda)) (setf (lambda-bind clambda) nil)) + (setf (functional-kind clambda) :zombie) + (let ((home (lambda-home clambda))) + (setf (lambda-lets home) (delete clambda (lambda-lets home)))) (values)) ;;; This function is called when one of the arguments to a LET @@ -1412,9 +1376,9 @@ ;;; 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 @@ -1425,40 +1389,42 @@ ;;; 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 ((use-component (node-component use))) - (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-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)) @@ -1471,10 +1437,10 @@ ;;; 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)) @@ -1483,32 +1449,31 @@ (let* ((vars (lambda-vars fun)) (union (mapcar (lambda (arg var) (when (and arg - (continuation-reoptimize arg) + (lvar-reoptimize arg) (null (basic-var-sets var))) - (continuation-type arg))) + (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))) + (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)) @@ -1529,55 +1494,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))) + (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 (continuation-use fun))) + (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-fun-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 @@ -1610,18 +1571,18 @@ (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) - (fun-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)))) @@ -1629,14 +1590,14 @@ (when (and min (< total-nvals min)) (compiler-warn "MULTIPLE-VALUE-CALL with ~R values when the function expects ~ - at least ~R." + 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-warn "MULTIPLE-VALUE-CALL with ~R values when the function expects ~ - at most ~R." + at most ~R." total-nvals max) (setf (basic-combination-kind node) :error) (return-from ir1-optimize-mv-call))) @@ -1673,14 +1634,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-fun-name (combination-fun use)) + (eq (lvar-fun-name (combination-fun use)) 'values)) (let* ((fun (combination-lambda call)) (vars (lambda-vars fun)) @@ -1694,28 +1654,29 @@ (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 for cont = (make-continuation use) - and prev = node-prev then cont - repeat (- nvars nvals) - do (reference-constant prev cont nil) - (res cont)) - (setq vals (res))) - (link-node-to-previous-continuation 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) - (setf (continuation-%externally-checkable-type fun-cont) nil)) + (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))) + (reoptimize-lvar (first vals))) (propagate-to-args use fun) (reoptimize-call use)) t))) @@ -1728,24 +1689,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-fun-name (combination-fun use)) + (eq (lvar-fun-name (combination-fun use)) 'list)) - ;; FIXME: VALUES might not satisfy an assertion on NODE-CONT. - (change-ref-leaf (continuation-use (combination-fun node)) + ;; 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 (continuation-%externally-checkable-type arg) nil)) + (setf (lvar-dest arg) node) + (flush-lvar-externally-checkable-type arg)) (setf (combination-args use) nil) (flush-dest list) (setf (combination-args node) args)) @@ -1755,12 +1716,99 @@ ;;; to a PROG1. This allows the computation of the additional values ;;; to become dead code. (deftransform values ((&rest vals) * * :node node) - (unless (continuation-single-value-p (node-cont node)) + (unless (lvar-single-value-p (node-lvar node)) (give-up-ir1-transform)) - (setf (node-derived-type node) *wild-type*) + (setf (node-derived-type node) + (make-short-values-type (list (single-value-type + (node-derived-type node))))) + (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)) + (atype (cast-asserted-type cast))) + (when (not do-not-optimize) + (let ((lvar (node-lvar cast))) + (when (values-subtypep (lvar-derived-type value) + (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)))) + (ensure-block-start (node-prev cast)) + (reoptimize-lvar lvar) + (setf (lvar-%derived-type value) nil)) + (%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))))))) + + (let* ((value-type (lvar-derived-type value)) + (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 + (if (cast-single-value-p cast) + `(list 'dummy) + `(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)))) + (delete-block-lazily (node-block cast)) + (return-from ir1-optimize-cast))) + (when (eq (node-derived-type cast) *empty-type*) + (maybe-terminate-block cast nil)) + + (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)))