X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1opt.lisp;h=02b83404f7121a28e73546816a787c2d4a42f4a7;hb=25e76ec2b1083ac6a4bba42af7ad7b5a8239f2b8;hp=8236a05f0ba6cadeee0b2cc84125560a01e84419;hpb=29a9ccc860532b32c566aec095f570e999a9c52c;p=sbcl.git diff --git a/src/compiler/ir1opt.lisp b/src/compiler/ir1opt.lisp index 8236a05..02b8340 100644 --- a/src/compiler/ir1opt.lisp +++ b/src/compiler/ir1opt.lisp @@ -56,9 +56,9 @@ (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 +;;; 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, +;;; CONTINUATION-TYPE. This may be called on deleted continuations, ;;; always returning *. ;;; ;;; What we do is call CONTINUATION-PROVEN-TYPE and check whether the @@ -84,6 +84,18 @@ (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)) @@ -106,11 +118,48 @@ (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))) + (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))))))) ;;;; 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. ;;; @@ -119,7 +168,7 @@ ;;; 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)) (unless (member (continuation-kind cont) '(:deleted :unused)) @@ -140,15 +189,15 @@ (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 +;;; 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))) @@ -167,23 +216,34 @@ (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))) + (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) +(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)) + (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 @@ -191,20 +251,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))) @@ -212,7 +273,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 @@ -221,108 +283,106 @@ ;;; and doing IR1 optimizations. We can ignore all blocks that don't ;;; have the REOPTIMIZE flag set. If COMPONENT-REOPTIMIZE is true when ;;; we are done, then another iteration would be beneficial. -;;; -;;; We delete blocks when there is either no predecessor or the block -;;; is in a lambda that has been deleted. These blocks would -;;; eventually be deleted by DFO recomputation, but doing it here -;;; immediately makes the effect available to IR1 optimization. (defun ir1-optimize (component) (declare (type component component)) (setf (component-reoptimize component) nil) (do-blocks (block component) (cond - ((or (block-delete-p block) - (null (block-pred block)) - (eq (functional-kind (block-home-lambda block)) :deleted)) - (delete-block block)) - (t - (loop - (let ((succ (block-succ block))) - (unless (and succ (null (rest succ))) - (return))) - - (let ((last (block-last block))) - (typecase last - (cif - (flush-dest (if-test last)) - (when (unlink-node last) - (return))) - (exit - (when (maybe-delete-exit last) - (return))))) - - (unless (join-successor-if-possible block) - (return))) - - (when (and (block-reoptimize block) (block-component block)) - (aver (not (block-delete-p block))) - (ir1-optimize-block block)) - - (when (and (block-flush-p block) (block-component block)) - (aver (not (block-delete-p block))) - (flush-dead-code block))))) + ;; We delete blocks when there is either no predecessor or the + ;; block is in a lambda that has been deleted. These blocks + ;; would eventually be deleted by DFO recomputation, but doing + ;; it here immediately makes the effect available to IR1 + ;; optimization. + ((or (block-delete-p block) + (null (block-pred block))) + (delete-block block)) + ((eq (functional-kind (block-home-lambda block)) :deleted) + ;; Preserve the BLOCK-SUCC invariant that almost every block has + ;; one successor (and a block with DELETE-P set is an acceptable + ;; exception). + (mark-for-deletion block) + (delete-block block)) + (t + (loop + (let ((succ (block-succ block))) + (unless (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)) + + (cond ((block-delete-p block) + (delete-block block)) + ((and (block-flush-p block) (block-component block)) + (flush-dead-code block)))))) (values)) -;;; Loop over the nodes in Block, looking for stuff that needs to be -;;; optimized. We dispatch off of the type of each node with its -;;; reoptimize flag set: - -;;; -- With a COMBINATION, we call PROPAGATE-FUN-CHANGE whenever -;;; the function changes, and call IR1-OPTIMIZE-COMBINATION if any -;;; argument changes. -;;; -- With an EXIT, we derive the node's type from the VALUE's type. -;;; We don't propagate CONT's assertion to the VALUE, since if we -;;; did, this would move the checking of CONT's assertion to the -;;; exit. This wouldn't work with CATCH and UWP, where the EXIT -;;; node is just a placeholder for the actual unknown exit. +;;; Loop over the nodes in BLOCK, acting on (and clearing) REOPTIMIZE +;;; flags. ;;; -;;; Note that we clear the node & block reoptimize flags *before* -;;; doing the optimization. This ensures that the node or block will -;;; be reoptimized if necessary. We leave the NODE-OPTIMIZE flag set -;;; going into IR1-OPTIMIZE-RETURN, since IR1-OPTIMIZE-RETURN wants to -;;; clear the flag itself. +;;; Note that although they are cleared here, REOPTIMIZE flags might +;;; still be set upon return from this function, meaning that further +;;; optimization is wanted (as a consequence of optimizations we did). (defun ir1-optimize-block (block) (declare (type cblock block)) + ;; We clear the node and block REOPTIMIZE flags before doing the + ;; optimization, not after. This ensures that the node or block will + ;; be reoptimized if necessary. (setf (block-reoptimize block) nil) (do-nodes (node cont block :restart-p t) (when (node-reoptimize node) + ;; As above, we clear the node REOPTIMIZE flag before optimizing. (setf (node-reoptimize node) nil) (typecase node (ref) (combination + ;; With a COMBINATION, we call PROPAGATE-FUN-CHANGE whenever + ;; the function changes, and call IR1-OPTIMIZE-COMBINATION if + ;; any argument changes. (ir1-optimize-combination node)) (cif (ir1-optimize-if node)) (creturn + ;; KLUDGE: We leave the NODE-OPTIMIZE flag set going into + ;; IR1-OPTIMIZE-RETURN, since IR1-OPTIMIZE-RETURN wants to + ;; clear the flag itself. -- WHN 2002-02-02, quoting original + ;; CMU CL comments (setf (node-reoptimize node) t) (ir1-optimize-return node)) (mv-combination (ir1-optimize-mv-combination node)) (exit + ;; With an EXIT, we derive the node's type from the VALUE's + ;; type. 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. (let ((value (exit-value node))) (when value (derive-node-type node (continuation-derived-type value))))) (cset (ir1-optimize-set node))))) + (values)) -;;; We cannot combine with a successor block if: -;;; 1. The successor has more than one predecessor. -;;; 2. The last node's CONT is also used somewhere else. -;;; 3. The successor is the current block (infinite loop). -;;; 4. The next block has a different cleanup, and thus we may want -;;; to insert cleanup code between the two blocks at some point. -;;; 5. The next block has a different home lambda, and thus the -;;; control transfer is a non-local exit. -;;; -;;; If we succeed, we return true, otherwise false. -;;; -;;; Joining is easy when the successor's Start continuation is the -;;; same from our Last's Cont. If they differ, then we can still join -;;; when the last continuation has no next and the next continuation -;;; has no uses. In this case, we replace the next continuation with -;;; the last before joining the blocks. +;;; Try to join with a successor block. If we succeed, we return true, +;;; otherwise false. (defun join-successor-if-possible (block) (declare (type cblock block)) (let ((next (first (block-succ block)))) @@ -330,22 +390,39 @@ (let* ((last (block-last block)) (last-cont (node-cont last)) (next-cont (block-start next))) - (cond ((or (rest (block-pred next)) - (not (eq (continuation-use last-cont) last)) - (eq next block) - (not (eq (block-end-cleanup block) - (block-start-cleanup next))) - (not (eq (block-home-lambda block) - (block-home-lambda next)))) + (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. + ;; 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.] @@ -359,7 +436,7 @@ nil)))))) ;;; Join together two blocks which have the same ending/starting -;;; continuation. The code in Block2 is moved into Block1 and Block2 +;;; 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. (defun join-blocks (block1 block2) @@ -394,13 +471,9 @@ (values)) -;;; Delete any nodes in BLOCK whose value is unused and have no -;;; side-effects. We can delete sets of lexical variables when the set +;;; Delete any nodes in BLOCK whose value is unused and which have no +;;; side effects. We can delete sets of lexical variables when the set ;;; variable has no references. -;;; -;;; [### For now, don't delete potentially flushable calls when they -;;; have the CALL attribute. Someday we should look at the funcitonal -;;; args to determine if they have any side-effects.] (defun flush-dead-code (block) (declare (type cblock block)) (do-nodes-backwards (node cont block) @@ -413,8 +486,28 @@ (let ((info (combination-kind node))) (when (fun-info-p info) (let ((attr (fun-info-attributes info))) - (when (and (ir1-attributep attr flushable) - (not (ir1-attributep attr call))) + (when (and (not (ir1-attributep attr call)) + ;; ### For now, don't delete potentially + ;; flushable calls when they have the CALL + ;; attribute. Someday we should look at the + ;; functional args to determine if they have + ;; any side effects. + (if (policy node (= safety 3)) + (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 unsafely-flushable))) (flush-dest (combination-fun node)) (dolist (arg (combination-args node)) (flush-dest arg)) @@ -582,6 +675,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) (add-continuation-use new-node dummy-cont) (setf (block-last new-block) new-node) @@ -605,9 +699,9 @@ ;;; This function attempts to delete an exit node, returning true if ;;; it deletes the block as a consequence: -;;; -- If the exit is degenerate (has no Entry), then we don't do +;;; -- If the exit is degenerate (has no ENTRY), then we don't do ;;; anything, since there is nothing to be done. -;;; -- If the exit node and its Entry have the same home lambda then +;;; -- If the exit node and its ENTRY have the same home lambda then ;;; we know the exit is local, and can delete the exit. We change ;;; uses of the Exit-Value to be uses of the original continuation, ;;; then unlink the node. If the exit is to a TR context, then we @@ -686,9 +780,7 @@ ;; cross-compiler can't fold it because the ;; cross-compiler doesn't know how to evaluate it. #+sb-xc-host - (let* ((ref (continuation-use (combination-fun node))) - (fun-name (leaf-source-name (ref-leaf ref)))) - (fboundp fun-name))) + (fboundp (combination-fun-source-name node))) (constant-fold-call node) (return-from ir1-optimize-combination))) @@ -778,11 +870,6 @@ ;;; if necessary. We claim that the parent form is LABELS for ;;; context declarations, since we don't want it to be considered ;;; a real global function. -;;; -- In addition to a direct check for the function name in the -;;; table, we also must check for slot accessors. If the function -;;; is a slot accessor, then we set the combination kind to the -;;; function info of %SLOT-SETTER or %SLOT-ACCESSOR, as -;;; appropriate. ;;; -- If it is a known function, mark it as such by setting the KIND. ;;; ;;; We return the leaf referenced (NIL if not a leaf) and the @@ -836,13 +923,7 @@ (values (ref-leaf (continuation-use (basic-combination-fun call))) nil)) (t - (let* ((name (leaf-source-name leaf)) - (info (info :function :info - (if (slot-accessor-p leaf) - (if (consp source-name) ; i.e. if SETF function - '%slot-setter - '%slot-accessor) - name)))) + (let ((info (info :function :info (leaf-source-name leaf)))) (if info (values leaf (setf (basic-combination-kind call) info)) (values leaf nil))))))) @@ -915,30 +996,31 @@ (continuation-use (basic-combination-fun call)) call)) ((not 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)))))) - (when (and (leaf-has-source-name-p leaf) - ;; 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. - (symbolp (leaf-source-name leaf))) - (let ((dummies (make-gensym-list (length - (combination-args call))))) - (transform-call call - `(lambda ,dummies - (,(leaf-source-name leaf) - ,@dummies))))))))))) + ((and (leaf-has-source-name-p leaf) + (or (info :function :source-transform (leaf-source-name leaf)) + (and info + (ir1-attributep (fun-info-attributes info) + predicate) + (let ((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)))))))))) (values)) ;;;; known function optimization @@ -973,24 +1055,13 @@ (policy node (>= speed inhibit-warnings)) (policy node (> speed inhibit-warnings)))) (*compiler-error-context* node)) - (cond ((not (member (transform-when transform) - '(:native :both))) - ;; FIXME: Make sure that there's a transform for - ;; (MEMBER SYMBOL ..) into MEMQ. - ;; FIXME: Note that when/if I make SHARE operation to shared - ;; constant data between objects in the system, remember that a - ;; SHAREd list, or other SHAREd compound object, can be processed - ;; recursively, so that e.g. the two lists above can share their - ;; '(:BOTH) tail sublists. - (let ((when (transform-when transform))) - (not (or (eq when :both) - (eq when :native)))) - t) - ((or (not constrained) + (cond ((or (not constrained) (valid-fun-use node type :strict-result t)) (multiple-value-bind (severity args) (catch 'give-up-ir1-transform - (transform-call node (funcall fun node)) + (transform-call node + (funcall fun node) + (combination-fun-source-name node)) (values :none nil)) (ecase severity (:none @@ -1086,50 +1157,111 @@ (setf (component-reoptimize (block-component block)) t))))))) reoptimize)) - ;;; Take the lambda-expression RES, IR1 convert it in the proper ;;; environment, and then install it as the function for the call ;;; NODE. We do local call analysis so that the new function is ;;; integrated into the control flow. -(defun transform-call (node res) +;;; +;;; We require the original function source name in order to generate +;;; a meaningful debug name for the lambda we set up. (It'd be +;;; possible to do this starting from debug names as well as source +;;; names, but as of sbcl-0.7.1.5, there was no need for this +;;; generality, since source names are always known to our callers.) +(defun transform-call (node res source-name) (declare (type combination node) (list res)) + (aver (and (legal-fun-name-p source-name) + (not (eql source-name '.anonymous.)))) (with-ir1-environment-from-node node - (let ((new-fun (ir1-convert-inline-lambda - res - :debug-name "something inlined in TRANSFORM-CALL")) - (ref (continuation-use (combination-fun node)))) - (change-ref-leaf ref new-fun) - (setf (combination-kind node) :full) - (locall-analyze-component *current-component*))) + (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)))) + (change-ref-leaf ref new-fun) + (setf (combination-kind node) :full) + (locall-analyze-component *current-component*))) (values)) ;;; Replace a call to a foldable function of constant arguments with -;;; the result of evaluating the form. We insert the resulting -;;; constant node after the call, stealing the call's continuation. We -;;; give the call a continuation with no DEST, which should cause it -;;; and its arguments to go away. If there is an error during the +;;; the result of evaluating the form. If there is an error during the ;;; evaluation, we give a warning and leave the call alone, making the ;;; call a :ERROR call. ;;; ;;; If there is more than one value, then we transform the call into a -;;; values form. +;;; VALUES form. +;;; +;;; 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) - (declare (type combination call)) - (let* ((args (mapcar #'continuation-value (combination-args call))) - (ref (continuation-use (combination-fun call))) - (fun-name (leaf-source-name (ref-leaf ref)))) - + (let ((args (mapcar #'continuation-value (combination-args call))) + (fun-name (combination-fun-source-name call))) (multiple-value-bind (values win) - (careful-call fun-name args call "constant folding") - (if (not win) - (setf (combination-kind call) :error) - (let ((dummies (make-gensym-list (length args)))) - (transform-call - call - `(lambda ,dummies - (declare (ignore ,@dummies)) - (values ,@(mapcar (lambda (x) `',x) values)))))))) - + (careful-call fun-name + args + call + ;; Note: CMU CL had COMPILER-WARN here, and that + ;; seems more natural, but it's probably not. + ;; + ;; It's especially not while bug 173 exists: + ;; Expressions like + ;; (COND (END + ;; (UNLESS (OR UNSAFE? (<= END SIZE))) + ;; ...)) + ;; can cause constant-folding TYPE-ERRORs (in + ;; #'<=) when END can be proved to be NIL, even + ;; though the code is perfectly legal and safe + ;; because a NIL value of END means that the + ;; #'<= will never be executed. + ;; + ;; Moreover, even without bug 173, + ;; quite-possibly-valid code like + ;; (COND ((NONINLINED-PREDICATE END) + ;; (UNLESS (<= END SIZE)) + ;; ...)) + ;; (where NONINLINED-PREDICATE is something the + ;; compiler can't do at compile time, but which + ;; turns out to make the #'<= expression + ;; unreachable when END=NIL) could cause errors + ;; when the compiler tries to constant-fold (<= + ;; END SIZE). + ;; + ;; So, with or without bug 173, it'd be + ;; unnecessarily evil to do a full + ;; COMPILER-WARNING (and thus return FAILURE-P=T + ;; from COMPILE-FILE) for legal code, so we we + ;; use a wimpier COMPILE-STYLE-WARNING instead. + #'compiler-style-warn + "constant folding") + (cond ((not win) + (setf (combination-kind call) :error)) + ((and (proper-list-of-length-p values 1) + (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)))) + (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 @@ -1150,13 +1282,16 @@ (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 type) + (setf (node-reoptimize set) nil)))) (propagate-to-refs var (res))) (values)) @@ -1176,7 +1311,7 @@ (derive-node-type node (continuation-type (set-value node))) (values)) -;;; Return true if the value of Ref will always be the same (and is +;;; Return true if the value of REF will always be the same (and is ;;; thus legal to substitute.) (defun constant-reference-p (ref) (declare (type ref ref)) @@ -1189,7 +1324,12 @@ (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. @@ -1203,13 +1343,14 @@ ;;; -- the var's DEST has a different policy than the ARG's (think safety). ;;; ;;; We change the REF to be a reference to NIL with unused value, and -;;; let it be flushed as dead code. A side-effect of this substitution +;;; let it be flushed as dead code. A side effect of this substitution ;;; is to delete the variable. (defun substitute-single-use-continuation (arg var) (declare (type continuation arg) (type lambda-var var)) (let* ((ref (first (leaf-refs var))) (cont (node-cont ref)) (cont-atype (continuation-asserted-type cont)) + (cont-ctype (continuation-type-to-check cont)) (dest (continuation-dest cont))) (when (and (eq (continuation-use cont) ref) dest @@ -1226,7 +1367,7 @@ (lexenv-policy (node-lexenv (continuation-dest arg))))) (aver (member (continuation-kind arg) '(:block-start :deleted-block-start :inside-block))) - (assert-continuation-type arg cont-atype) + (set-continuation-type-assertion arg cont-atype cont-ctype) (setf (node-derived-type ref) *wild-type*) (change-ref-leaf ref (find-constant nil)) (substitute-continuation arg cont) @@ -1237,15 +1378,15 @@ ;;; any unreferenced variables. Note that FLUSH-DEAD-CODE will come ;;; along right away and delete the REF and then the lambda, since we ;;; flush the FUN continuation. -(defun delete-let (fun) - (declare (type clambda fun)) - (aver (member (functional-kind fun) '(:let :mv-let))) - (note-unreferenced-vars fun) - (let ((call (let-combination fun))) +(defun delete-let (clambda) + (declare (type clambda clambda)) + (aver (functional-letlike-p clambda)) + (note-unreferenced-vars clambda) + (let ((call (let-combination clambda))) (flush-dest (basic-combination-fun call)) (unlink-node call) - (unlink-node (lambda-bind fun)) - (setf (lambda-bind fun) nil)) + (unlink-node (lambda-bind clambda)) + (setf (lambda-bind clambda) nil)) (values)) ;;; This function is called when one of the arguments to a LET @@ -1485,7 +1626,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)))) @@ -1551,7 +1692,8 @@ (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 (combination-fun use) fun-cont) + (setf (continuation-%externally-checkable-type fun-cont) nil)) (setf (combination-kind use) :local) (setf (functional-kind fun) :let) (flush-dest (first (basic-combination-args call))) @@ -1581,7 +1723,8 @@ (setf (combination-kind node) :full) (let ((args (combination-args use))) (dolist (arg args) - (setf (continuation-dest arg) node)) + (setf (continuation-dest arg) node) + (setf (continuation-%externally-checkable-type arg) nil)) (setf (combination-args use) nil) (flush-dest list) (setf (combination-args node) args))