X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1opt.lisp;h=6e868c2b42153fea98e2d5bb31475704fc8336b8;hb=d6cacf136631916da0db8bbe32554ca499e17589;hp=6fcb1e7a1e393929799397e71da9bcec604c739c;hpb=a52bbbda8ae06f5b501dd0d40c60d89f96d5471c;p=sbcl.git diff --git a/src/compiler/ir1opt.lisp b/src/compiler/ir1opt.lisp index 6fcb1e7..6e868c2 100644 --- a/src/compiler/ir1opt.lisp +++ b/src/compiler/ir1opt.lisp @@ -22,39 +22,18 @@ ;;; 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)))))) + (let ((use (principal-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)))) + (let ((use (principal-continuation-use cont))) + (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 @@ -63,7 +42,7 @@ ;;; ;;; 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 +;;; 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 @@ -76,46 +55,26 @@ (defun continuation-derived-type (cont) (declare (type continuation cont)) (or (continuation-%derived-type cont) - (%continuation-derived-type cont))) + (setf (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)) + (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))))) ;;; Return the derived type for CONT's first value. This is guaranteed ;;; not to be a VALUES or FUNCTION type. -(declaim (ftype (function (continuation) ctype) continuation-type)) +(declaim (ftype (sfunction (continuation) ctype) continuation-type)) (defun continuation-type (cont) (single-value-type (continuation-derived-type cont))) @@ -134,12 +93,14 @@ (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) - (setf (continuation-%externally-checkable-type arg) - *wild-type*)) + (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) @@ -150,14 +111,19 @@ (loop for arg of-type continuation in args and type of-type ctype in arg-types - do (setf (continuation-%externally-checkable-type arg) - type)) + do (when arg + (setf (continuation-%externally-checkable-type arg) + (coerce-to-values type)))) (continuation-%externally-checkable-type cont))))))) +(declaim (inline flush-continuation-externally-checkable-type)) +(defun flush-continuation-externally-checkable-type (cont) + (declare (type continuation cont)) + (setf (continuation-%externally-checkable-type cont) 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 CONT. Optimizers must ;;; make sure that they don't call for reoptimization when nothing has ;;; happened, since optimization will fail to terminate. ;;; @@ -166,11 +132,11 @@ ;;; 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. +;;; careful not to fly into space when the DEST's PREV is missing. (defun reoptimize-continuation (cont) (declare (type continuation cont)) + (setf (continuation-%derived-type cont) nil) (unless (member (continuation-kind cont) '(:deleted :unused)) - (setf (continuation-%derived-type cont) nil) (let ((dest (continuation-dest cont))) (when dest (setf (continuation-reoptimize cont) t) @@ -187,20 +153,28 @@ (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-continuation-uses (cont) + (declare (type continuation cont)) + (dolist (use (find-uses cont)) + (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-CONTINUATION on the NODE-CONT. (defun derive-node-type (node rtype) (declare (type 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)) + (cont (node-cont node))) (when (type/= node-type int) (when (and *check-consistency* (eq int *empty-type*) @@ -211,26 +185,40 @@ ~% ~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)))))) + (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-continuation cont))))) (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) +;;; error for CONT's value not to be TYPEP to TYPE. We implement it +;;; splitting off DEST a new CAST node. If we improve the assertion, +;;; we set TYPE-CHECK and TYPE-ASSERTED to guarantee that the new +;;; assertion will be checked. We return the new "argument" +;;; continuation of DEST. +(defun assert-continuation-type (cont type policy) (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)) + (if (values-subtypep (continuation-derived-type cont) type) + cont + (let* ((dest (continuation-dest cont)) + (prev-cont (node-prev dest))) + (aver dest) + (with-ir1-environment-from-node dest + (let* ((cast (make-cast cont type policy)) + (checked-value (make-continuation))) + (setf (continuation-next prev-cont) cast + (node-prev cast) prev-cont) + (use-continuation cast checked-value) + (link-node-to-previous-continuation dest checked-value) + (substitute-continuation checked-value cont) + (setf (continuation-dest cont) cast) + (reoptimize-continuation cont) + checked-value))))) ;;; 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 @@ -238,20 +226,21 @@ (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))) + (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))) + (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))) + (assert-continuation-type arg opt policy))) (let ((rest (fun-type-rest type))) (when rest (dolist (arg args) - (assert-continuation-type arg rest)))) + (assert-continuation-type arg rest policy)))) (dolist (key (fun-type-keywords type)) (let ((name (key-info-name key))) @@ -259,7 +248,8 @@ ((null arg)) (when (eq (continuation-value (first arg)) name) (assert-continuation-type - (second arg) (key-info-type key))))))) + (second arg) (key-info-type key) + policy)))))) (values)) ;;;; IR1-OPTIMIZE @@ -273,53 +263,47 @@ (setf (component-reoptimize component) nil) (do-blocks (block component) (cond - ((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). - (labels ((mark-blocks (block) - (dolist (pred (block-pred block)) - (unless (or (block-delete-p pred) - (eq (component-head (block-component pred)) - pred)) - (setf (block-delete-p pred) t) - (mark-blocks pred))))) - (mark-blocks 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 - (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)) - ;; 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. - (when (and (block-flush-p block) (block-component block)) - (aver (not (block-delete-p block))) - (flush-dead-code block))))) + ((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)) @@ -368,7 +352,10 @@ (when value (derive-node-type node (continuation-derived-type value))))) (cset - (ir1-optimize-set node))))) + (ir1-optimize-set node)) + (cast + (ir1-optimize-cast node))))) + (values)) ;;; Try to join with a successor block. If we succeed, we return true, @@ -376,7 +363,7 @@ (defun join-successor-if-possible (block) (declare (type cblock block)) (let ((next (first (block-succ block)))) - (when (block-start next) + (when (block-start next) ; NEXT is not an END-OF-COMPONENT marker (let* ((last (block-last block)) (last-cont (node-cont last)) (next-cont (block-start next))) @@ -385,6 +372,7 @@ ;; The successor has more than one predecessor. (rest (block-pred next)) ;; The last node's CONT is also used somewhere else. + ;; (as in (IF (M-V-PROG1 ...) (M-V-PROG1 ...))) (not (eq (continuation-use last-cont) last)) ;; The successor is the current block (infinite loop). (eq next block) @@ -399,13 +387,13 @@ (block-home-lambda next)))) nil) ;; Joining is easy when the successor's START - ;; continuation is the same from our LAST's CONT. + ;; 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. + ;; has no uses. ((and (null (block-start-uses next)) (eq (continuation-kind last-cont) :inside-block)) ;; In this case, we replace the next @@ -422,6 +410,18 @@ (setf (block-start next) last-cont) (join-blocks block next)) t) + ((and (null (block-start-uses next)) + (not (typep (continuation-dest last-cont) + '(or exit creturn))) + (null (continuation-lexenv-uses last-cont))) + (assert (null (find-uses next-cont))) + (when (continuation-dest last-cont) + (substitute-continuation next-cont last-cont)) + (delete-continuation-use last) + (add-continuation-use last next-cont) + (setf (continuation-%derived-type next-cont) nil) + (join-blocks block next) + t) (t nil)))))) @@ -483,25 +483,9 @@ ;; 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-dest (combination-fun node)) - (dolist (arg (combination-args node)) - (flush-dest arg)) - (unlink-node node)))))) + (flush-combination node)))))) (mv-combination (when (eq (basic-combination-kind node) :local) (let ((fun (combination-lambda node))) @@ -523,7 +507,11 @@ (flush-dest (set-value node)) (setf (basic-var-sets var) (delete node (basic-var-sets var))) - (unlink-node node))))))) + (unlink-node node)))) + (cast + (unless (cast-type-check node) + (flush-dest (cast-value node)) + (unlink-node node)))))) (setf (block-flush-p block) nil) (values)) @@ -559,9 +547,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)) @@ -570,7 +561,7 @@ ;;; 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 @@ -618,21 +609,21 @@ (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))))) + (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)))) + (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 @@ -665,7 +656,7 @@ (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) + (flush-continuation-externally-checkable-type new-cont) (add-continuation-use new-node dummy-cont) (setf (block-last new-block) new-node) @@ -707,22 +698,14 @@ (declare (type exit node)) (let ((value (exit-value node)) (entry (exit-entry node)) - (cont (node-cont node))) + (cont (node-cont 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)))))))) + (if value + (delete-filter node cont value) + (unlink-node node))))) + ;;;; combination IR1 optimization @@ -770,7 +753,11 @@ ;; 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 #'continuation-value args)) + nil))) (constant-fold-call node) (return-from ir1-optimize-combination))) @@ -778,13 +765,13 @@ (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))) (unless (and fun (funcall fun node)) (dolist (x (fun-info-transforms kind)) - #!+sb-show + #!+sb-show (when *show-transforms-p* (let* ((cont (basic-combination-fun node)) (fname (continuation-fun-name cont t))) @@ -797,54 +784,54 @@ (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. We also change +;;; the NODE's CONT to be a dummy continuation to prevent the use from +;;; confusing things. ;;; -;;; 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 +(defun maybe-terminate-block (node ir1-converting-not-optimizing-p) + (declare (type (or basic-combination cast) node)) + (let* ((block (node-block node)) + (cont (node-cont 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-converting-not-optimizing-p - (eq (continuation-kind cont) :deleted)))) - (eq (node-derived-type call) *empty-type*)) + (when (or (and (not (or ir1-converting-not-optimizing-p + (eq (continuation-kind cont) :deleted))) + (eq (continuation-derived-type cont) *empty-type*)) + (eq (node-derived-type node) *empty-type*)) (cond (ir1-converting-not-optimizing-p - (delete-continuation-use call) + (delete-continuation-use node) (cond ((block-last block) - (aver (and (eq (block-last block) call) + (aver (and (eq (block-last block) node) (eq (continuation-kind cont) :block-start)))) (t - (setf (block-last block) call) + (setf (block-last block) node) (link-blocks block (continuation-starts-block cont))))) (t - (node-ends-block call) - (delete-continuation-use call) + (node-ends-block node) + (delete-continuation-use node) (if (eq (continuation-kind cont) :unused) (delete-continuation cont) (reoptimize-continuation cont)))) - + (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)) + (add-continuation-use node (make-continuation)) t)))) ;;; This is called both by IR1 conversion and IR1 optimization when @@ -864,14 +851,6 @@ ;;; ;;; 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))) @@ -952,7 +931,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)) @@ -993,24 +972,16 @@ 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 ((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 @@ -1046,7 +1017,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 @@ -1157,33 +1128,42 @@ ;;; 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 (node res source-name) - (declare (type combination node) (list res)) +(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.)))) - (with-ir1-environment-from-node node + (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 (continuation-use (combination-fun node)))) + (ref (continuation-use (combination-fun call)))) (change-ref-leaf ref new-fun) - (setf (combination-kind node) :full) - (locall-analyze-component *current-component*))) + (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. +;;; +;;; 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))) (fun-name (combination-fun-source-name call))) @@ -1217,22 +1197,36 @@ ;; when the compiler tries to constant-fold (<= ;; END SIZE). ;; - ;; So, with or without bug 173, it'd be + ;; 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") - (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))) - fun-name))))) + (cond ((not win) + (setf (combination-kind call) :error)) + ((and (proper-list-of-length-p values 1) + (eq (continuation-kind (node-cont call)) :inside-block)) + (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) + (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 @@ -1249,17 +1243,25 @@ (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)) + (let* ((cont (node-cont ref)) + (dest (continuation-dest cont))) + ;; KLUDGE: LET var substitution + (when (combination-p dest) + (reoptimize-continuation cont)))))) (values)))) ;;; 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 value 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)) (dolist (set (basic-var-sets var)) - (res (continuation-type (set-value set))) - (setf (node-reoptimize set) nil)) + (let ((type (continuation-type (set-value set)))) + (res type) + (when (node-reoptimize set) + (derive-node-type set (make-single-value-type type)) + (setf (node-reoptimize set) nil)))) (propagate-to-refs var (res))) (values)) @@ -1276,7 +1278,8 @@ (setf (continuation-reoptimize iv) nil) (propagate-from-sets var (continuation-type iv))))))) - (derive-node-type node (continuation-type (set-value node))) + (derive-node-type node (make-single-value-type + (continuation-type (set-value node)))) (values)) ;;; Return true if the value of REF will always be the same (and is @@ -1292,18 +1295,21 @@ (not (eq (defined-fun-inlinep leaf) :notinline))) (global-var (case (global-var-kind leaf) - (:global-function 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). +;;; -- CONT carries unknown number of values, or +;;; -- DEST is return or exit, or +;;; -- DEST is sensitive to the number of values and ARG return non-one value. ;;; ;;; 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 @@ -1312,24 +1318,29 @@ (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))) + (typecase dest + (cast + (and (type-single-value-p (continuation-derived-type arg)) + (multiple-value-bind (pdest pprev) + (principal-continuation-end cont) + (declare (ignore pdest)) + (continuation-single-value-p pprev)))) + (mv-combination + (or (eq (basic-combination-fun dest) cont) + (and (eq (basic-combination-kind dest) :local) + (type-single-value-p (continuation-derived-type arg))))) + ((or creturn exit) + nil) + (t + ;; (AVER (CONTINUATION-SINGLE-VALUE-P CONT)) + t)) (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))))) + (lambda-home (lambda-var-home var)))) (aver (member (continuation-kind arg) '(:block-start :deleted-block-start :inside-block))) - (assert-continuation-type arg cont-atype) (setf (node-derived-type ref) *wild-type*) (change-ref-leaf ref (find-constant nil)) (substitute-continuation arg cont) @@ -1358,9 +1369,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 @@ -1386,8 +1397,10 @@ (when (ref-p use) (let ((leaf (ref-leaf use))) (when (and (constant-reference-p use) - (values-subtypep (leaf-type leaf) - (continuation-asserted-type arg))) + (csubtypep (leaf-type leaf) + ;; (NODE-DERIVED-TYPE USE) would + ;; be better -- APD, 2003-05-15 + (leaf-type var))) (propagate-to-refs var (continuation-type arg)) (let ((use-component (node-component use))) (substitute-leaf-if @@ -1400,11 +1413,11 @@ leaf var)) t))))) ((and (null (rest (leaf-refs var))) - (substitute-single-use-continuation arg var))) + (substitute-single-use-continuation arg var))) (t (propagate-to-refs var (continuation-type arg)))))) - (when (every #'null (combination-args call)) + (when (every #'not (combination-args call)) (delete-let fun)) (values)) @@ -1417,9 +1430,9 @@ ;;; 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 +;;; 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. (defun propagate-local-call-args (call fun) (declare (type combination call) (type clambda fun)) @@ -1510,19 +1523,16 @@ ;;; 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)))))) + (let* ((arg (first (basic-combination-args node))) + (vars (lambda-vars (combination-lambda node))) + (n-vars (length vars)) + (types (values-type-in (continuation-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 (continuation-reoptimize arg) nil)) (values)) @@ -1560,7 +1570,7 @@ (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) @@ -1588,7 +1598,7 @@ (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)))) @@ -1642,7 +1652,7 @@ (setf (node-prev use) nil) (setf (continuation-next node-prev) nil) (collect ((res vals)) - (loop as cont = (make-continuation use) + (loop for cont = (make-continuation use) and prev = node-prev then cont repeat (- nvars nvals) do (reference-constant prev cont nil) @@ -1655,14 +1665,15 @@ (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)) + (flush-continuation-externally-checkable-type fun-cont)) (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)) + (propagate-to-args use fun) + (reoptimize-call use)) t))) ;;; If we see: @@ -1675,18 +1686,22 @@ ;;; 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.) +;;; +;;; FIXME: Thus we lose possible type assertions on (LIST ...). (defoptimizer (values-list optimizer) ((list) node) (let ((use (continuation-use list))) (when (and (combination-p use) (eq (continuation-fun-name (combination-fun use)) 'list)) + + ;; FIXME: VALUES might not satisfy an assertion on NODE-CONT. (change-ref-leaf (continuation-use (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)) + (flush-continuation-externally-checkable-type arg)) (setf (combination-args use) nil) (flush-dest list) (setf (combination-args node) args)) @@ -1696,13 +1711,88 @@ ;;; 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 (continuation-single-value-p (node-cont node)) (give-up-ir1-transform)) (setf (node-derived-type node) *wild-type*) + (principal-continuation-single-valuify (node-cont 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 (continuation-derived-type value)) + (cont (node-cont cast)) + (dest (continuation-dest cont)) + (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-continuation + value + `(multiple-value-call #'list 'dummy)) + (filter-continuation + value + ;; FIXME: Derived type. + `(%compile-time-type-error 'dummy + ',(type-specifier atype) + ',(type-specifier value-type))) + ;; KLUDGE: FILTER-CONTINUATION 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. + (derive-node-type (continuation-use value) *empty-type*) + (maybe-terminate-block (continuation-use 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 (and (not do-not-optimize) + (values-subtypep value-type + (cast-asserted-type cast))) + (delete-filter cast cont value) + (reoptimize-continuation cont) + (when (continuation-single-value-p cont) + (note-single-valuified-continuation cont)) + (when (not dest) + (reoptimize-continuation-uses cont)) + (return-from ir1-optimize-cast t)) + + (when (and (not do-not-optimize) + (not (continuation-use value)) + dest) + (collect ((merges)) + (do-uses (use value) + (when (and (values-subtypep (node-derived-type use) atype) + (immediately-used-p value use)) + (ensure-block-start cont) + (delete-continuation-use use) + (add-continuation-use use cont) + (unlink-blocks (node-block use) (node-block cast)) + (link-blocks (node-block use) (continuation-block cont)) + (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)))