(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))))))
+ (or (let ((use (principal-lvar-use thing)))
+ (and (ref-p use) (constant-p (ref-leaf use))))
+ ;; check for EQL types (but not singleton numeric types)
+ (let ((type (lvar-type thing)))
+ (values (type-singleton-p type))))))
;;; 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))))
+ (let ((use (principal-lvar-use lvar))
+ (type (lvar-type lvar))
+ leaf)
+ (if (and (ref-p use)
+ (constant-p (setf leaf (ref-leaf use))))
+ (constant-value leaf)
+ (multiple-value-bind (constantp value) (type-singleton-p type)
+ (unless constantp
+ (error "~S used on non-constant LVAR ~S" 'lvar-value lvar))
+ value))))
\f
;;;; interface for obtaining results of type inference
;;; 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.
+(eval-when (:compile-toplevel :execute)
+ (#+sb-xc-host cl:defmacro
+ #-sb-xc-host sb!xc:defmacro
+ lvar-type-using (lvar accessor)
+ `(let ((uses (lvar-uses ,lvar)))
+ (cond ((null uses) *empty-type*)
+ ((listp uses)
+ (do ((res (,accessor (first uses))
+ (values-type-union (,accessor (first current))
+ res))
+ (current (rest uses) (rest current)))
+ ((or (null current) (eq res *wild-type*))
+ res)))
+ (t
+ (,accessor uses))))))
+
#!-sb-fluid (declaim (inline lvar-derived-type))
(defun lvar-derived-type (lvar)
(declare (type lvar 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))))))
+ (lvar-type-using lvar node-derived-type))
;;; Return the derived type for LVAR's first value. This is guaranteed
;;; not to be a VALUES or FUNCTION type.
(defun lvar-type (lvar)
(single-value-type (lvar-derived-type lvar)))
+;;; LVAR-CONSERVATIVE-TYPE
+;;;
+;;; Certain types refer to the contents of an object, which can
+;;; change without type derivation noticing: CONS types and ARRAY
+;;; types suffer from this:
+;;;
+;;; (let ((x (the (cons fixnum fixnum) (cons a b))))
+;;; (setf (car x) c)
+;;; (+ (car x) (cdr x)))
+;;;
+;;; Python doesn't realize that the SETF CAR can change the type of X -- so we
+;;; cannot use LVAR-TYPE which gets the derived results. Worse, still, instead
+;;; of (SETF CAR) we might have a call to a user-defined function FOO which
+;;; does the same -- so there is no way to use the derived information in
+;;; general.
+;;;
+;;; So, the conservative option is to use the derived type if the leaf has
+;;; only a single ref -- in which case there cannot be a prior call that
+;;; mutates it. Otherwise we use the declared type or punt to the most general
+;;; type we know to be correct for sure.
+(defun lvar-conservative-type (lvar)
+ (let ((derived-type (lvar-type lvar))
+ (t-type *universal-type*))
+ ;; Recompute using NODE-CONSERVATIVE-TYPE instead of derived type if
+ ;; necessary -- picking off some easy cases up front.
+ (cond ((or (eq derived-type t-type)
+ ;; Can't use CSUBTYPEP!
+ (type= derived-type (specifier-type 'list))
+ (type= derived-type (specifier-type 'null)))
+ derived-type)
+ ((and (cons-type-p derived-type)
+ (eq t-type (cons-type-car-type derived-type))
+ (eq t-type (cons-type-cdr-type derived-type)))
+ derived-type)
+ ((and (array-type-p derived-type)
+ (or (not (array-type-complexp derived-type))
+ (let ((dimensions (array-type-dimensions derived-type)))
+ (or (eq '* dimensions)
+ (every (lambda (dim) (eq '* dim)) dimensions)))))
+ derived-type)
+ ((type-needs-conservation-p derived-type)
+ (single-value-type (lvar-type-using lvar node-conservative-type)))
+ (t
+ derived-type))))
+
+(defun node-conservative-type (node)
+ (let* ((derived-values-type (node-derived-type node))
+ (derived-type (single-value-type derived-values-type)))
+ (if (ref-p node)
+ (let ((leaf (ref-leaf node)))
+ (if (and (basic-var-p leaf)
+ (cdr (leaf-refs leaf)))
+ (coerce-to-values
+ (if (eq :declared (leaf-where-from leaf))
+ (leaf-type leaf)
+ (conservative-type derived-type)))
+ derived-values-type))
+ derived-values-type)))
+
+(defun conservative-type (type)
+ (cond ((or (eq type *universal-type*)
+ (eq type (specifier-type 'list))
+ (eq type (specifier-type 'null)))
+ type)
+ ((cons-type-p type)
+ (specifier-type 'cons))
+ ((array-type-p type)
+ (if (array-type-complexp type)
+ (make-array-type
+ ;; ADJUST-ARRAY may change dimensions, but rank stays same.
+ :dimensions
+ (let ((old (array-type-dimensions type)))
+ (if (eq '* old)
+ old
+ (mapcar (constantly '*) old)))
+ ;; Complexity cannot change.
+ :complexp (array-type-complexp type)
+ ;; Element type cannot change.
+ :element-type (array-type-element-type type)
+ :specialized-element-type (array-type-specialized-element-type type))
+ ;; Simple arrays cannot change at all.
+ type))
+ ((union-type-p type)
+ ;; Conservative union type is an union of conservative types.
+ (let ((res *empty-type*))
+ (dolist (part (union-type-types type) res)
+ (setf res (type-union res (conservative-type part))))))
+ (t
+ ;; Catch-all.
+ ;;
+ ;; If the type contains some CONS types, the conservative type contains all
+ ;; of them.
+ (when (types-equal-or-intersect type (specifier-type 'cons))
+ (setf type (type-union type (specifier-type 'cons))))
+ ;; Similarly for non-simple arrays -- it should be possible to preserve
+ ;; more information here, but really...
+ (let ((non-simple-arrays (specifier-type '(and array (not simple-array)))))
+ (when (types-equal-or-intersect type non-simple-arrays)
+ (setf type (type-union type non-simple-arrays))))
+ type)))
+
+(defun type-needs-conservation-p (type)
+ (cond ((eq type *universal-type*)
+ ;; Excluding T is necessary, because we do want type derivation to
+ ;; be able to narrow it down in case someone (most like a macro-expansion...)
+ ;; actually declares something as having type T.
+ nil)
+ ((or (cons-type-p type) (and (array-type-p type) (array-type-complexp type)))
+ ;; Covered by the next case as well, but this is a quick test.
+ t)
+ ((types-equal-or-intersect type (specifier-type '(or cons (and array (not simple-array)))))
+ t)))
+
;;; 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))
it (coerce-to-values type)))
(t (coerce-to-values type)))))
dest)))))
- (lvar-%externally-checkable-type lvar))
+ (or (lvar-%externally-checkable-type lvar) *wild-type*))
#!-sb-fluid(declaim (inline flush-lvar-externally-checkable-type))
(defun flush-lvar-externally-checkable-type (lvar)
(declare (type lvar lvar))
\f
;;;; interface routines used by optimizers
+(declaim (inline reoptimize-component))
+(defun reoptimize-component (component kind)
+ (declare (type component component)
+ (type (member nil :maybe t) kind))
+ (aver kind)
+ (unless (eq (component-reoptimize component) t)
+ (setf (component-reoptimize component) kind)))
+
;;; This function is called by optimizers to indicate that something
;;; interesting has happened to the value of LVAR. Optimizers must
;;; make sure that they don't call for reoptimization when nothing has
(when (typep dest 'cif)
(setf (block-test-modified block) t))
(setf (block-reoptimize block) t)
- (setf (component-reoptimize component) t))))
+ (reoptimize-component component :maybe))))
(do-uses (node lvar)
(setf (block-type-check (node-block node)) t)))
(values))
(do-uses (use lvar)
(setf (node-reoptimize use) t)
(setf (block-reoptimize (node-block use)) t)
- (setf (component-reoptimize (node-component use)) t)))
+ (reoptimize-component (node-component use) :maybe)))
;;; Annotate NODE to indicate that its result has been proven to be
;;; TYPEP to RTYPE. After IR1 conversion has happened, this is 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-LVAR on the NODE-LVAR.
-(defun derive-node-type (node rtype)
+(defun derive-node-type (node rtype &key from-scratch)
(declare (type valued-node node) (type ctype rtype))
- (let ((node-type (node-derived-type node)))
- (unless (eq node-type rtype)
+ (let* ((initial-type (node-derived-type node))
+ (node-type (if from-scratch
+ *wild-type*
+ initial-type)))
+ (unless (eq initial-type rtype)
(let ((int (values-type-intersection node-type rtype))
(lvar (node-lvar node)))
- (when (type/= node-type int)
- (when (and *check-consistency*
- (eq int *empty-type*)
- (not (eq rtype *empty-type*)))
- (let ((*compiler-error-context* node))
- (compiler-warn
- "New inferred type ~S conflicts with old type:~
- ~% ~S~%*** possible internal error? Please report this."
- (type-specifier rtype) (type-specifier node-type))))
- (setf (node-derived-type node) int)
+ (when (type/= initial-type int)
+ (when (and *check-consistency*
+ (eq int *empty-type*)
+ (not (eq rtype *empty-type*)))
+ (aver (not from-scratch))
+ (let ((*compiler-error-context* node))
+ (compiler-warn
+ "New inferred type ~S conflicts with old type:~
+ ~% ~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)
(lambda-var-p (ref-leaf node)))
(let ((type (single-value-type int)))
(when (and (member-type-p type)
- (null (rest (member-type-members type))))
+ (eql 1 (member-type-size type)))
(change-ref-leaf node (find-constant
(first (member-type-members type)))))))
- (reoptimize-lvar lvar)))))
+ (reoptimize-lvar lvar)))))
(values))
;;; This is similar to DERIVE-NODE-TYPE, but asserts that it is an
(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))))))
+ (let ((internal-lvar (make-lvar))
+ (dest (lvar-dest lvar)))
+ (substitute-lvar internal-lvar lvar)
+ (let ((cast (insert-cast-before dest lvar type policy)))
+ (use-lvar cast internal-lvar)
+ t))))
\f
;;;; IR1-OPTIMIZE
;;; 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.
-(defun ir1-optimize (component)
+(defun ir1-optimize (component fastp)
(declare (type component component))
(setf (component-reoptimize component) nil)
(loop with block = (block-next (component-head component))
(unless (join-successor-if-possible block)
(return)))
- (when (and (block-reoptimize block) (block-component block))
+ (when (and (not fastp) (block-reoptimize block) (block-component block))
(aver (not (block-delete-p block)))
(ir1-optimize-block block))
;; As above, we clear the node REOPTIMIZE flag before optimizing.
(setf (node-reoptimize node) nil)
(typecase node
- (ref)
- (combination
- ;; With a COMBINATION, we call PROPAGATE-FUN-CHANGE whenever
- ;; the function changes, and call IR1-OPTIMIZE-COMBINATION if
- ;; any argument changes.
- (ir1-optimize-combination node))
- (cif
- (ir1-optimize-if node))
- (creturn
- ;; KLUDGE: We leave the NODE-OPTIMIZE flag set going into
- ;; IR1-OPTIMIZE-RETURN, since IR1-OPTIMIZE-RETURN wants to
- ;; clear the flag itself. -- WHN 2002-02-02, quoting original
- ;; CMU CL comments
- (setf (node-reoptimize node) t)
- (ir1-optimize-return node))
- (mv-combination
- (ir1-optimize-mv-combination node))
- (exit
- ;; With an EXIT, we derive the node's type from the VALUE's
- ;; type.
- (let ((value (exit-value node)))
- (when value
- (derive-node-type node (lvar-derived-type value)))))
- (cset
- (ir1-optimize-set node))
+ (ref)
+ (combination
+ ;; With a COMBINATION, we call PROPAGATE-FUN-CHANGE whenever
+ ;; the function changes, and call IR1-OPTIMIZE-COMBINATION if
+ ;; any argument changes.
+ (ir1-optimize-combination node))
+ (cif
+ (ir1-optimize-if node))
+ (creturn
+ ;; KLUDGE: We leave the NODE-OPTIMIZE flag set going into
+ ;; IR1-OPTIMIZE-RETURN, since IR1-OPTIMIZE-RETURN wants to
+ ;; clear the flag itself. -- WHN 2002-02-02, quoting original
+ ;; CMU CL comments
+ (setf (node-reoptimize node) t)
+ (ir1-optimize-return node))
+ (mv-combination
+ (ir1-optimize-mv-combination node))
+ (exit
+ ;; With an EXIT, we derive the node's type from the VALUE's
+ ;; type.
+ (let ((value (exit-value node)))
+ (when value
+ (derive-node-type node (lvar-derived-type value)))))
+ (cset
+ ;; PROPAGATE-FROM-SETS can do a better job if NODE-REOPTIMIZE
+ ;; is accurate till the node actually has been reoptimized.
+ (setf (node-reoptimize node) t)
+ (ir1-optimize-set node))
(cast
(ir1-optimize-cast node)))))
;; 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)))
+ ;; 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)
(declare (type cblock block1 block2))
(let* ((last1 (block-last block1))
(last2 (block-last block2))
- (succ (block-succ block2))
- (start2 (block-start block2)))
+ (succ (block-succ block2))
+ (start2 (block-start block2)))
(do ((ctran start2 (node-next (ctran-next ctran))))
- ((not ctran))
+ ((not ctran))
(setf (ctran-block ctran) block1))
(unlink-blocks block1 block2)
(setf (block-last block1) last2))
(setf (block-flags block1)
- (attributes-union (block-flags block1)
- (block-flags block2)
- (block-attributes type-asserted test-modified)))
+ (attributes-union (block-flags block1)
+ (block-flags block2)
+ (block-attributes type-asserted test-modified)))
(let ((next (block-next block2))
- (prev (block-prev block2)))
+ (prev (block-prev block2)))
(setf (block-next prev) next)
(setf (block-prev next) prev))
;;; 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.
-(defun flush-dead-code (block)
+(defun flush-dead-code (block &aux victim)
(declare (type cblock block))
(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 ((attr (fun-info-attributes info)))
- (when (and (not (ir1-attributep attr call))
- ;; ### For now, don't delete potentially
- ;; flushable calls when they have the CALL
- ;; attribute. Someday we should look at the
- ;; functional args to determine if they have
- ;; any side effects.
- (if (policy node (= safety 3))
- (ir1-attributep attr flushable)
- (ir1-attributep attr unsafely-flushable)))
- (flush-combination node))))))
- (mv-combination
- (when (eq (basic-combination-kind node) :local)
- (let ((fun (combination-lambda node)))
- (when (dolist (var (lambda-vars fun) t)
- (when (or (leaf-refs var)
- (lambda-var-sets var))
- (return nil)))
- (flush-dest (first (basic-combination-args node)))
- (delete-let fun)))))
- (exit
- (let ((value (exit-value node)))
- (when value
- (flush-dest value)
- (setf (exit-value node) nil))))
- (cset
- (let ((var (set-var node)))
- (when (and (lambda-var-p var)
- (null (leaf-refs var)))
- (flush-dest (set-value node))
- (setf (basic-var-sets var)
- (delq node (basic-var-sets var)))
- (unlink-node node))))
+ (ref
+ (setf victim node)
+ (delete-ref node)
+ (unlink-node node))
+ (combination
+ (when (flushable-combination-p node)
+ (setf victim node)
+ (flush-combination node)))
+ (mv-combination
+ (when (eq (basic-combination-kind node) :local)
+ (let ((fun (combination-lambda node)))
+ (when (dolist (var (lambda-vars fun) t)
+ (when (or (leaf-refs var)
+ (lambda-var-sets var))
+ (return nil)))
+ (setf victim node)
+ (flush-dest (first (basic-combination-args node)))
+ (delete-let fun)))))
+ (exit
+ (let ((value (exit-value node)))
+ (when value
+ (setf victim node)
+ (flush-dest value)
+ (setf (exit-value node) nil))))
+ (cset
+ (let ((var (set-var node)))
+ (when (and (lambda-var-p var)
+ (null (leaf-refs var)))
+ (setf victim node)
+ (flush-dest (set-value node))
+ (setf (basic-var-sets var)
+ (delq node (basic-var-sets var)))
+ (unlink-node node))))
(cast
(unless (cast-type-check node)
+ (setf victim node)
(flush-dest (cast-value node))
(unlink-node node))))))
- (values))
+ victim)
\f
;;;; local call return type propagation
;;; appropriate.)
;;;
;;; We call MAYBE-CONVERT-TAIL-LOCAL-CALL on each local non-MV
-;;; combination, which may change the succesor of the call to be the
+;;; combination, which may change the successor of the call to be the
;;; called function, and if so, checks if the call can become an
;;; assignment. If we convert to an assignment, we abort, since the
;;; RETURN has been deleted.
(use-union)
;; )
))
- (setf (return-result-type node) int))))
+ (setf (return-result-type node) int))))
nil)
;;; Do stuff to realize that something has changed about the value
\f
;;;; IF optimization
-;;; If the test has multiple uses, replicate the node when possible.
-;;; Also check whether the predicate is known to be true or false,
+;;; Utility: return T if both argument cblocks are equivalent. For now,
+;;; detect only blocks that read the same leaf into the same lvar, and
+;;; continue to the same block.
+(defun cblocks-equivalent-p (x y)
+ (declare (type cblock x y))
+ (and (ref-p (block-start-node x))
+ (eq (block-last x) (block-start-node x))
+
+ (ref-p (block-start-node y))
+ (eq (block-last y) (block-start-node y))
+
+ (equal (block-succ x) (block-succ y))
+ (eql (ref-lvar (block-start-node x)) (ref-lvar (block-start-node y)))
+ (eql (ref-leaf (block-start-node x)) (ref-leaf (block-start-node y)))))
+
+;;; Check whether the predicate is known to be true or false,
;;; deleting the IF node in favor of the appropriate branch when this
;;; is the case.
+;;; Similarly, when both branches are equivalent, branch directly to either
+;;; of them.
+;;; Also, if the test has multiple uses, replicate the node when possible...
+;;; in fact, splice in direct jumps to the right branch if possible.
(defun ir1-optimize-if (node)
(declare (type cif node))
(let ((test (if-test node))
- (block (node-block node)))
-
- (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 (not (listp (lvar-uses test))) (return)))))
-
+ (block (node-block node)))
(let* ((type (lvar-type test))
+ (consequent (if-consequent node))
+ (alternative (if-alternative node))
(victim
(cond ((constant-lvar-p test)
- (if (lvar-value test)
- (if-alternative node)
- (if-consequent node)))
+ (if (lvar-value test) alternative consequent))
((not (types-equal-or-intersect type (specifier-type 'null)))
- (if-alternative node))
+ alternative)
((type= type (specifier-type 'null))
- (if-consequent node)))))
+ consequent)
+ ((or (eq consequent alternative) ; Can this happen?
+ (cblocks-equivalent-p alternative consequent))
+ alternative))))
(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))
+ (kill-if-branch-1 node test block victim)
+ (return-from ir1-optimize-if (values))))
+ (tension-if-if-1 node test block)
+ (duplicate-if-if-1 node test block)
+ (values)))
+
+;; When we know that we only have a single successor, kill the victim
+;; ... unless the victim and the remaining successor are the same.
+(defun kill-if-branch-1 (node test block victim)
+ (declare (type cif node))
+ (flush-dest test)
+ (when (rest (block-succ block))
+ (unlink-blocks block victim))
+ (setf (component-reanalyze (node-component node)) t)
+ (unlink-node node))
+
+;; When if/if conversion would leave (if ... (if nil ...)) or
+;; (if ... (if not-nil ...)), splice the correct successor right
+;; in.
+(defun tension-if-if-1 (node test block)
+ (when (and (eq (block-start-node block) node)
+ (listp (lvar-uses test)))
+ (do-uses (use test)
+ (when (immediately-used-p test use)
+ (let* ((type (single-value-type (node-derived-type use)))
+ (target (if (type= type (specifier-type 'null))
+ (if-alternative node)
+ (multiple-value-bind (typep surep)
+ (ctypep nil type)
+ (and (not typep) surep
+ (if-consequent node))))))
+ (when target
+ (let ((pred (node-block use)))
+ (cond ((listp (lvar-uses test))
+ (change-block-successor pred block target)
+ (delete-lvar-use use))
+ (t
+ ;; only one use left. Just kill the now-useless
+ ;; branch to avoid spurious code deletion notes.
+ (aver (rest (block-succ block)))
+ (kill-if-branch-1
+ node test block
+ (if (eql target (if-alternative node))
+ (if-consequent node)
+ (if-alternative node)))
+ (return-from tension-if-if-1))))))))))
+
+;; Finally, duplicate EQ-nil tests
+(defun duplicate-if-if-1 (node test 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)
+ ;; leave the last use as is, instead of replacing
+ ;; the (singly-referenced) CIF node with a duplicate.
+ (when (not (listp (lvar-uses test))) (return))))))
;;; Create a new copy of an IF node that tests the value of the node
;;; USE. The test must have >1 use, and must be immediately used by
(declare (type node use) (type cif node))
(with-ir1-environment-from-node node
(let* ((block (node-block node))
- (test (if-test node))
- (cblock (if-consequent node))
- (ablock (if-alternative node))
- (use-block (node-block use))
- (new-ctran (make-ctran))
- (new-lvar (make-lvar))
- (new-node (make-if :test new-lvar
- :consequent cblock
- :alternative ablock))
- (new-block (ctran-starts-block new-ctran)))
+ (test (if-test node))
+ (cblock (if-consequent node))
+ (ablock (if-alternative node))
+ (use-block (node-block use))
+ (new-ctran (make-ctran))
+ (new-lvar (make-lvar))
+ (new-node (make-if :test new-lvar
+ :consequent cblock
+ :alternative ablock))
+ (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)
(defun maybe-delete-exit (node)
(declare (type exit node))
(let ((value (exit-value node))
- (entry (exit-entry node)))
+ (entry (exit-entry node)))
(when (and entry
- (eq (node-home-lambda node) (node-home-lambda entry)))
+ (eq (node-home-lambda node) (node-home-lambda entry)))
(setf (entry-exits entry) (delq node (entry-exits entry)))
(if value
(delete-filter node (node-lvar node) value)
#!+sb-show
(defvar *show-transforms-p* nil)
+(defun check-important-result (node info)
+ (when (and (null (node-lvar node))
+ (ir1-attributep (fun-info-attributes info) important-result))
+ (let ((*compiler-error-context* node))
+ (compiler-style-warn
+ "The return value of ~A should not be discarded."
+ (lvar-fun-name (basic-combination-fun node))))))
+
;;; Do IR1 optimizations on a COMBINATION node.
(declaim (ftype (function (combination) (values)) ir1-optimize-combination))
(defun ir1-optimize-combination (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)
+ (if (eq (functional-kind fun) :let)
+ (propagate-let-args node fun)
+ (propagate-local-call-args node fun))))
+ (:error
(dolist (arg args)
- (when arg
- (setf (lvar-reoptimize arg) nil))))
- (t
+ (when arg
+ (setf (lvar-reoptimize arg) nil))))
+ (:full
+ (dolist (arg args)
+ (when arg
+ (setf (lvar-reoptimize arg) nil)))
+ (cond (info
+ (check-important-result node info)
+ (let ((fun (fun-info-destroyed-constant-args info)))
+ (when fun
+ (let ((destroyed-constant-args (funcall fun args)))
+ (when destroyed-constant-args
+ (let ((*compiler-error-context* node))
+ (warn 'constant-modified
+ :fun-name (lvar-fun-name
+ (basic-combination-fun node)))
+ (setf (basic-combination-kind node) :error)
+ (return-from ir1-optimize-combination))))))
+ (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))))))
+ (t
+ ;; Check against the DEFINED-TYPE unless TYPE is already good.
+ (let* ((fun (basic-combination-fun node))
+ (uses (lvar-uses fun))
+ (leaf (when (ref-p uses) (ref-leaf uses))))
+ (multiple-value-bind (type defined-type)
+ (if (global-var-p leaf)
+ (values (leaf-type leaf) (leaf-defined-type leaf))
+ (values nil nil))
+ (when (and (not (fun-type-p type)) (fun-type-p defined-type))
+ (validate-call-type node type leaf)))))))
+ (:known
+ (aver info)
(dolist (arg args)
- (when arg
- (setf (lvar-reoptimize arg) nil)))
-
- (let ((attr (fun-info-attributes kind)))
- (when (and (ir1-attributep attr foldable)
- ;; KLUDGE: The next test could be made more sensitive,
- ;; only suppressing constant-folding of functions with
- ;; CALL attributes when they're actually passed
- ;; function arguments. -- WHN 19990918
- (not (ir1-attributep attr call))
- (every #'constant-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
- ;; functions don't necessarily exist at runtime on
- ;; a plain vanilla ANSI Common Lisp
- ;; cross-compilation host, in which case the
- ;; cross-compiler can't fold it because the
- ;; cross-compiler doesn't know how to evaluate it.
- #+sb-xc-host
- (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)))
- (when fun
- (let ((res (funcall fun node)))
- (when 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
- (when *show-transforms-p*
- (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
- (when *show-transforms-p*
- (/show "quitting because IR1-TRANSFORM result was NIL"))
- (return))))))))
+ (when arg
+ (setf (lvar-reoptimize arg) nil)))
+ (check-important-result node info)
+ (let ((fun (fun-info-destroyed-constant-args info)))
+ (when (and fun
+ ;; If somebody is really sure that they want to modify
+ ;; constants, let them.
+ (policy node (> check-constant-modification 0)))
+ (let ((destroyed-constant-args (funcall fun args)))
+ (when destroyed-constant-args
+ (let ((*compiler-error-context* node))
+ (warn 'constant-modified
+ :fun-name (lvar-fun-name
+ (basic-combination-fun node)))
+ (setf (basic-combination-kind node) :error)
+ (return-from ir1-optimize-combination))))))
+
+ (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-lvar-p args)
+ (node-lvar node))
+ (constant-fold-call node)
+ (return-from ir1-optimize-combination)))
+
+ (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)))))
+
+ (let ((fun (fun-info-optimizer info)))
+ (unless (and fun (funcall fun node))
+ ;; First give the VM a peek at the call
+ (multiple-value-bind (style transform)
+ (combination-implementation-style node)
+ (ecase style
+ (:direct
+ ;; The VM knows how to handle this.
+ )
+ (:transform
+ ;; The VM mostly knows how to handle this. We need
+ ;; to massage the call slightly, though.
+ (transform-call node transform (combination-fun-source-name node)))
+ ((:default :maybe)
+ ;; Let transforms have a crack at it.
+ (dolist (x (fun-info-transforms info))
+ #!+sb-show
+ (when *show-transforms-p*
+ (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
+ (when *show-transforms-p*
+ (/show "quitting because IR1-TRANSFORM result was NIL"))
+ (return)))))))))))
(values))
+(defun xep-tail-combination-p (node)
+ (and (combination-p node)
+ (let* ((lvar (combination-lvar node))
+ (dest (when (lvar-p lvar) (lvar-dest lvar)))
+ (lambda (when (return-p dest) (return-lambda dest))))
+ (and (lambda-p lambda)
+ (eq :external (lambda-kind lambda))))))
+
;;; If NODE doesn't return (i.e. return type is NIL), then terminate
;;; the block there, and link it to the component tail.
;;;
;;;
;;; 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))
+ (declare (type (or basic-combination cast ref) node))
(let* ((block (node-block node))
- (lvar (node-lvar node))
+ (lvar (node-lvar node))
(ctran (node-next node))
- (tail (component-tail (block-component block)))
- (succ (first (block-succ block))))
+ (tail (component-tail (block-component block)))
+ (succ (first (block-succ block))))
+ (declare (ignore lvar))
(unless (or (and (eq node (block-last block)) (eq succ tail))
- (block-delete-p block))
- (when (eq (node-derived-type node) *empty-type*)
- (cond (ir1-converting-not-optimizing-p
- (cond
+ (block-delete-p block))
+ ;; Even if the combination will never return, don't terminate if this
+ ;; is the tail call of a XEP: doing that would inhibit TCO.
+ (when (and (eq (node-derived-type node) *empty-type*)
+ (not (xep-tail-combination-p node)))
+ (cond (ir1-converting-not-optimizing-p
+ (cond
((block-last block)
(aver (eq (block-last block) node)))
(t
(setf (ctran-block ctran) nil)
(setf (node-next node) nil)
(link-blocks block (ctran-starts-block ctran)))))
- (t
- (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)
- (if ir1-converting-not-optimizing-p
- (%delete-lvar-use node)
- (delete-lvar-use node))
- t))))
+ (t
+ (node-ends-block node)))
+
+ (let ((succ (first (block-succ block))))
+ (unlink-blocks block succ)
+ (setf (component-reanalyze (block-component block)) t)
+ (aver (not (block-succ block)))
+ (link-blocks block tail)
+ (cond (ir1-converting-not-optimizing-p
+ (%delete-lvar-use node))
+ (t (delete-lvar-use node)
+ (when (null (block-pred succ))
+ (mark-for-deletion succ)))))
+ t))))
;;; This is called both by IR1 conversion and IR1 optimization when
;;; they have verified the type signature for the call, and are
(defun recognize-known-call (call ir1-converting-not-optimizing-p)
(declare (type combination 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)))
+ (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)))
+ (eq (global-var-kind leaf) :global-function)))
(values leaf nil))
((and (ecase inlinep
- (:inline t)
- (:no-chance nil)
- ((nil :maybe-inline) (policy call (zerop space))))
- (defined-fun-p leaf)
- (defined-fun-inline-expansion leaf)
- (let ((fun (defined-fun-functional leaf)))
- (or (not fun)
- (and (eq inlinep :inline) (functional-kind fun))))
- (inline-expansion-ok call))
- (flet (;; FIXME: Is this what the old CMU CL internal documentation
- ;; called semi-inlining? A more descriptive name would
- ;; be nice. -- WHN 2002-01-07
- (frob ()
- (let ((res (ir1-convert-lambda-for-defun
- (defined-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
- (frob)
- (with-ir1-environment-from-node call
- (frob)
- (locall-analyze-component *current-component*))))
-
- (values (ref-leaf (lvar-uses (basic-combination-fun call)))
- nil))
+ (:inline t)
+ (:no-chance nil)
+ ((nil :maybe-inline) (policy call (zerop space))))
+ (defined-fun-p leaf)
+ (defined-fun-inline-expansion leaf)
+ (inline-expansion-ok call))
+ ;; Inline: if the function has already been converted at another call
+ ;; site in this component, we point this REF to the functional. If not,
+ ;; we convert the expansion.
+ ;;
+ ;; For :INLINE case local call analysis will copy the expansion later,
+ ;; but for :MAYBE-INLINE and NIL cases we only get one copy of the
+ ;; expansion per component.
+ ;;
+ ;; FIXME: We also convert in :INLINE & FUNCTIONAL-KIND case below. What
+ ;; is it for?
+ (flet ((frob ()
+ (let* ((name (leaf-source-name leaf))
+ (res (ir1-convert-inline-expansion
+ name
+ (defined-fun-inline-expansion leaf)
+ leaf
+ inlinep
+ (info :function :info name))))
+ ;; Allow backward references to this function from following
+ ;; forms. (Reused only if policy matches.)
+ (push res (defined-fun-functionals leaf))
+ (change-ref-leaf ref res))))
+ (let ((fun (defined-fun-functional leaf)))
+ (if (or (not fun)
+ (and (eq inlinep :inline) (functional-kind fun)))
+ ;; Convert.
+ (if ir1-converting-not-optimizing-p
+ (frob)
+ (with-ir1-environment-from-node call
+ (frob)
+ (locall-analyze-component *current-component*)))
+ ;; If we've already converted, change ref to the converted
+ ;; functional.
+ (change-ref-leaf ref fun))))
+ (values (ref-leaf ref) nil))
(t
(let ((info (info :function :info (leaf-source-name leaf))))
- (if info
- (values leaf (setf (basic-combination-kind call) info))
- (values leaf nil)))))))
+ (if 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
;;; call, and do MAYBE-TERMINATE-BLOCK and return the values of
;;; syntax check, arg/result type processing, but still call
;;; RECOGNIZE-KNOWN-CALL, since the call might be to a known lambda,
;;; and that checking is done by local call analysis.
-(defun validate-call-type (call type ir1-converting-not-optimizing-p)
+(defun validate-call-type (call type fun &optional ir1-converting-not-optimizing-p)
(declare (type combination call) (type ctype type))
- (cond ((not (fun-type-p type))
- (aver (multiple-value-bind (val win)
- (csubtypep type (specifier-type 'function))
- (or val (not win))))
- (recognize-known-call call ir1-converting-not-optimizing-p))
- ((valid-fun-use call type
- :argument-test #'always-subtypep
- :result-test #'always-subtypep
- ;; KLUDGE: Common Lisp is such a dynamic
- ;; language that all we can do here in
- ;; general is issue a STYLE-WARNING. It
- ;; would be nice to issue a full WARNING
- ;; in the special case of of type
- ;; mismatches within a compilation unit
- ;; (as in section 3.2.2.3 of the spec)
- ;; but at least as of sbcl-0.6.11, we
- ;; don't keep track of whether the
- ;; mismatched data came from the same
- ;; compilation unit, so we can't do that.
- ;; -- WHN 2001-02-11
- ;;
- ;; FIXME: Actually, I think we could
- ;; issue a full WARNING if the call
- ;; violates a DECLAIM FTYPE.
- :lossage-fun #'compiler-style-warn
- :unwinnage-fun #'compiler-notify)
- (assert-call-type call type)
- (maybe-terminate-block call ir1-converting-not-optimizing-p)
- (recognize-known-call call ir1-converting-not-optimizing-p))
- (t
- (setf (combination-kind call) :error)
- (values nil nil))))
+ (let* ((where (when fun (leaf-where-from fun)))
+ (same-file-p (eq :defined-here where)))
+ (cond ((not (fun-type-p type))
+ (aver (multiple-value-bind (val win)
+ (csubtypep type (specifier-type 'function))
+ (or val (not win))))
+ ;; Using the defined-type too early is a bit of a waste: during
+ ;; conversion we cannot use the untrusted ASSERT-CALL-TYPE, etc.
+ (when (and fun (not ir1-converting-not-optimizing-p))
+ (let ((defined-type (leaf-defined-type fun)))
+ (when (and (fun-type-p defined-type)
+ (neq fun (combination-type-validated-for-leaf call)))
+ ;; Don't validate multiple times against the same leaf --
+ ;; it doesn't add any information, but may generate the same warning
+ ;; multiple times.
+ (setf (combination-type-validated-for-leaf call) fun)
+ (when (and (valid-fun-use call defined-type
+ :argument-test #'always-subtypep
+ :result-test nil
+ :lossage-fun (if same-file-p
+ #'compiler-warn
+ #'compiler-style-warn)
+ :unwinnage-fun #'compiler-notify)
+ same-file-p)
+ (assert-call-type call defined-type nil)
+ (maybe-terminate-block call ir1-converting-not-optimizing-p)))))
+ (recognize-known-call call ir1-converting-not-optimizing-p))
+ ((valid-fun-use call type
+ :argument-test #'always-subtypep
+ :result-test nil
+ :lossage-fun #'compiler-warn
+ :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))
+ (t
+ (setf (combination-kind call) :error)
+ (values nil nil)))))
;;; This is called by IR1-OPTIMIZE when the function for a call has
;;; changed. If the call is local, we try to LET-convert it, and
(defun propagate-fun-change (call)
(declare (type combination call))
(let ((*compiler-error-context* call)
- (fun-lvar (basic-combination-fun call)))
+ (fun-lvar (basic-combination-fun call)))
(setf (lvar-reoptimize fun-lvar) nil)
(case (combination-kind call)
(:local
(let ((fun (combination-lambda call)))
- (maybe-let-convert fun)
- (unless (member (functional-kind fun) '(:let :assignment :deleted))
- (derive-node-type call (tail-set-type (lambda-tail-set fun))))))
+ (maybe-let-convert fun)
+ (unless (member (functional-kind fun) '(:let :assignment :deleted))
+ (derive-node-type call (tail-set-type (lambda-tail-set fun))))))
(:full
(multiple-value-bind (leaf info)
- (validate-call-type call (lvar-type fun-lvar) nil)
- (cond ((functional-p leaf)
- (convert-call-if-possible
- (lvar-uses (basic-combination-fun call))
- call))
- ((not leaf))
- ((and (leaf-has-source-name-p leaf)
+ (let* ((uses (lvar-uses fun-lvar))
+ (leaf (when (ref-p uses) (ref-leaf uses))))
+ (validate-call-type call (lvar-type fun-lvar) leaf))
+ (cond ((functional-p leaf)
+ (convert-call-if-possible
+ (lvar-uses (basic-combination-fun call))
+ call))
+ ((not 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 ((lvar (node-lvar call)))
(and lvar (not (if-p (lvar-dest lvar))))))))
- (let ((name (leaf-source-name leaf))
+ (let ((name (leaf-source-name leaf))
(dummies (make-gensym-list
(length (combination-args call)))))
(transform-call call
;;; replace it, otherwise add a new one.
(defun record-optimization-failure (node transform args)
(declare (type combination node) (type transform transform)
- (type (or fun-type list) args))
+ (type (or fun-type list) args))
(let* ((table (component-failed-optimizations *component-being-compiled*))
- (found (assoc transform (gethash node table))))
+ (found (assoc transform (gethash node table))))
(if found
- (setf (cdr found) args)
- (push (cons transform args) (gethash node table))))
+ (setf (cdr found) args)
+ (push (cons transform args) (gethash node table))))
(values))
;;; Attempt to transform NODE using TRANSFORM-FUNCTION, subject to the
(defun ir1-transform (node transform)
(declare (type combination node) (type transform transform))
(let* ((type (transform-type transform))
- (fun (transform-function transform))
- (constrained (fun-type-p type))
- (table (component-failed-optimizations *component-being-compiled*))
- (flame (if (transform-important transform)
- (policy node (>= speed inhibit-warnings))
- (policy node (> speed inhibit-warnings))))
- (*compiler-error-context* node))
+ (fun (transform-function transform))
+ (constrained (fun-type-p type))
+ (table (component-failed-optimizations *component-being-compiled*))
+ (flame (if (transform-important transform)
+ (policy node (>= speed inhibit-warnings))
+ (policy node (> speed inhibit-warnings))))
+ (*compiler-error-context* node))
(cond ((or (not constrained)
- (valid-fun-use node type))
- (multiple-value-bind (severity args)
- (catch 'give-up-ir1-transform
- (transform-call node
- (funcall fun node)
- (combination-fun-source-name node))
- (values :none nil))
- (ecase severity
- (:none
- (remhash node table)
- nil)
- (:aborted
- (setf (combination-kind node) :error)
- (when args
- (apply #'compiler-warn args))
- (remhash node table)
- nil)
- (:failure
- (if args
- (when flame
- (record-optimization-failure node transform args))
- (setf (gethash node table)
- (remove transform (gethash node table) :key #'car)))
- t)
+ (valid-fun-use node type))
+ (multiple-value-bind (severity args)
+ (catch 'give-up-ir1-transform
+ (transform-call node
+ (funcall fun node)
+ (combination-fun-source-name node))
+ (values :none nil))
+ (ecase severity
+ (:none
+ (remhash node table)
+ nil)
+ (:aborted
+ (setf (combination-kind node) :error)
+ (when args
+ (apply #'warn args))
+ (remhash node table)
+ nil)
+ (:failure
+ (if args
+ (when flame
+ (record-optimization-failure node transform args))
+ (setf (gethash node table)
+ (remove transform (gethash node table) :key #'car)))
+ t)
(:delayed
(remhash node table)
nil))))
- ((and flame
- (valid-fun-use node
- type
- :argument-test #'types-equal-or-intersect
- :result-test #'values-types-equal-or-intersect))
- (record-optimization-failure node transform type)
- t)
- (t
- t))))
+ ((and flame
+ (valid-fun-use node
+ type
+ :argument-test #'types-equal-or-intersect
+ :result-test #'values-types-equal-or-intersect))
+ (record-optimization-failure node transform type)
+ t)
+ (t
+ t))))
;;; When we don't like an IR1 transform, we throw the severity/reason
;;; and args.
(setf *delayed-ir1-transforms*
(acons node reasons *delayed-ir1-transforms*))
(throw 'give-up-ir1-transform :delayed))
- ((cdr assoc)
+ ((cdr assoc)
(dolist (reason reasons)
(pushnew reason (cdr assoc)))
(throw 'give-up-ir1-transform :delayed)))))
;;; to be retried.
(defun retry-delayed-ir1-transforms (reason)
(setf *delayed-ir1-transforms*
- (remove-if-not #'cdr *delayed-ir1-transforms*))
+ (remove-if-not #'cdr *delayed-ir1-transforms*))
(let ((reoptimize nil))
(dolist (assoc *delayed-ir1-transforms*)
(let ((reasons (remove reason (cdr assoc))))
- (setf (cdr assoc) reasons)
- (unless reasons
- (let ((node (car assoc)))
- (unless (node-deleted node)
- (setf reoptimize t)
- (setf (node-reoptimize node) t)
- (let ((block (node-block node)))
- (setf (block-reoptimize block) t)
- (setf (component-reoptimize (block-component block)) t)))))))
+ (setf (cdr assoc) reasons)
+ (unless reasons
+ (let ((node (car assoc)))
+ (unless (node-deleted node)
+ (setf reoptimize t)
+ (setf (node-reoptimize node) t)
+ (let ((block (node-block node)))
+ (setf (block-reoptimize block) t)
+ (reoptimize-component (block-component block) :maybe)))))))
reoptimize))
;;; Take the lambda-expression RES, IR1 convert it in the proper
(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.))))
+ (not (eql source-name '.anonymous.))))
(node-ends-block call)
+ ;; The internal variables of a transform are not going to be
+ ;; interesting to the debugger, so there's no sense in
+ ;; suppressing the substitution of variables with only one use
+ ;; (the extra variables can slow down constraint propagation).
+ ;;
+ ;; This needs to be done before the WITH-IR1-ENVIRONMENT-FROM-NODE,
+ ;; so that it will bind *LEXENV* to the right environment.
+ (setf (combination-lexenv call)
+ (make-lexenv :default (combination-lexenv call)
+ :policy (process-optimize-decl
+ '(optimize
+ (preserve-single-use-debug-variables 0))
+ (lexenv-policy
+ (combination-lexenv 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
- "<unknown function>"))))
- (ref (lvar-use (combination-fun call))))
- (change-ref-leaf ref new-fun)
- (setf (combination-kind call) :full)
- (locall-analyze-component *current-component*))))
+ res
+ :debug-name (debug-name 'lambda-inlined source-name)
+ :system-lambda t))
+ (ref (lvar-use (combination-fun call))))
+ (change-ref-leaf ref new-fun)
+ (setf (combination-kind call) :full)
+ (locall-analyze-component *current-component*))))
(values))
;;; Replace a call to a foldable function of constant arguments with
;;; VALUES form.
(defun constant-fold-call (call)
(let ((args (mapcar #'lvar-value (combination-args call)))
- (fun-name (combination-fun-source-name call)))
+ (fun-name (combination-fun-source-name call)))
(multiple-value-bind (values win)
- (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")
+ (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.
+ #-sb-xc-host #'compiler-style-warn
+ ;; On the other hand, for code we control, we
+ ;; should be able to work around any bug
+ ;; 173-related problems, and in particular we
+ ;; want to be alerted to calls to our own
+ ;; functions which aren't being folded away; a
+ ;; COMPILER-WARNING is butch enough to stop the
+ ;; SBCL build itself in its tracks.
+ #+sb-xc-host #'compiler-warn
+ "constant folding")
(cond ((not win)
(setf (combination-kind call) :error))
((and (proper-list-of-length-p values 1))
\f
;;;; local call optimization
-;;; Propagate TYPE to LEAF and its REFS, marking things changed. If
-;;; the leaf type is a function type, then just leave it alone, since
-;;; TYPE is never going to be more specific than that (and
-;;; TYPE-INTERSECTION would choke.)
+;;; Propagate TYPE to LEAF and its REFS, marking things changed.
+;;;
+;;; If the leaf type is a function type, then just leave it alone, since TYPE
+;;; is never going to be more specific than that (and TYPE-INTERSECTION would
+;;; choke.)
+;;;
+;;; Also, if the type is one requiring special care don't touch it if the leaf
+;;; has multiple references -- otherwise LVAR-CONSERVATIVE-TYPE is screwed.
(defun propagate-to-refs (leaf type)
(declare (type leaf leaf) (type ctype type))
- (let ((var-type (leaf-type leaf)))
- (unless (fun-type-p var-type)
+ (let ((var-type (leaf-type leaf))
+ (refs (leaf-refs leaf)))
+ (unless (or (fun-type-p var-type)
+ (and (cdr refs)
+ (eq :declared (leaf-where-from leaf))
+ (type-needs-conservation-p var-type)))
(let ((int (type-approx-intersection2 var-type type)))
- (when (type/= int var-type)
- (setf (leaf-type leaf) int)
- (dolist (ref (leaf-refs leaf))
- (derive-node-type ref (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))))))
+ (when (type/= int var-type)
+ (setf (leaf-type leaf) int)
+ (let ((s-int (make-single-value-type int)))
+ (dolist (ref refs)
+ (derive-node-type ref s-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:
(() (null (rest sets)) :exit-if-null)
(set-use (principal-lvar-use (set-value set)))
(() (and (combination-p set-use)
- (fun-info-p (combination-kind set-use))
+ (eq (combination-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)
+ (or (eq (combination-fun-source-name set-use) '+)
+ (eq (combination-fun-source-name set-use) '-)))
+ :exit-if-null)
+ (minusp (eq (combination-fun-source-name set-use) '-))
(+-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)
+ :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)))))
+ (or (numeric-type-equal initial-type step-type)
+ ;; Detect cases like (LOOP FOR 1.0 to 5.0 ...), where
+ ;; the initial and the step are of different types,
+ ;; and the step is less contagious.
+ (numeric-type-equal initial-type
+ (numeric-contagion initial-type
+ step-type))))
+ (labels ((leftmost (x y cmp cmp=)
+ (cond ((eq x nil) nil)
+ ((eq y nil) nil)
+ ((listp x)
+ (let ((x1 (first x)))
+ (cond ((listp y)
+ (let ((y1 (first y)))
+ (if (funcall cmp x1 y1) x y)))
+ (t
+ (if (funcall cmp x1 y) x y)))))
+ ((listp y)
+ (let ((y1 (first y)))
+ (if (funcall cmp= x y1) x y)))
+ (t (if (funcall cmp x y) x y))))
+ (max* (x y) (leftmost x y #'> #'>=))
+ (min* (x y) (leftmost x y #'< #'<=)))
+ (multiple-value-bind (low high)
+ (let ((step-type-non-negative (csubtypep step-type (specifier-type
+ '(real 0 *))))
+ (step-type-non-positive (csubtypep step-type (specifier-type
+ '(real * 0)))))
+ (cond ((or (and step-type-non-negative (not minusp))
+ (and step-type-non-positive minusp))
+ (values (numeric-type-low initial-type)
+ (when (and (numeric-type-p set-type)
+ (numeric-type-equal set-type initial-type))
+ (max* (numeric-type-high initial-type)
+ (numeric-type-high set-type)))))
+ ((or (and step-type-non-positive (not minusp))
+ (and step-type-non-negative minusp))
+ (values (when (and (numeric-type-p set-type)
+ (numeric-type-equal set-type initial-type))
+ (min* (numeric-type-low 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))
;;; 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 initial-type)
- (collect ((res initial-type type-union))
- (dolist (set (basic-var-sets var))
+ (let ((changes (not (csubtypep (lambda-var-last-initial-type var) initial-type)))
+ (types nil))
+ (dolist (set (lambda-var-sets var))
(let ((type (lvar-type (set-value set))))
- (res type)
+ (push type types)
(when (node-reoptimize set)
- (derive-node-type set (make-single-value-type type))
+ (let ((old-type (node-derived-type set)))
+ (unless (values-subtypep old-type type)
+ (derive-node-type set (make-single-value-type type))
+ (setf changes t)))
(setf (node-reoptimize set) nil))))
- (let ((res (res)))
- (awhen (maybe-infer-iteration-var-type var initial-type)
- (setq res it))
- (propagate-to-refs var res)))
+ (when changes
+ (setf (lambda-var-last-initial-type var) initial-type)
+ (let ((res-type (or (maybe-infer-iteration-var-type var initial-type)
+ (apply #'type-union initial-type types))))
+ (propagate-to-refs var res-type))))
(values))
;;; If a LET variable, find the initial value's type and do
(let ((var (set-var node)))
(when (and (lambda-var-p var) (leaf-refs var))
(let ((home (lambda-var-home var)))
- (when (eq (functional-kind home) :let)
- (let* ((initial-value (let-var-initial-value var))
+ (when (eq (functional-kind home) :let)
+ (let* ((initial-value (let-var-initial-value var))
(initial-type (lvar-type initial-value)))
- (setf (lvar-reoptimize initial-value) nil)
+ (setf (lvar-reoptimize initial-value) nil)
(propagate-from-sets var initial-type))))))
-
(derive-node-type node (make-single-value-type
(lvar-type (set-value node))))
+ (setf (node-reoptimize node) nil)
(values))
;;; Return true if the value of REF will always be the same (and is
(not (eq (defined-fun-inlinep leaf) :notinline)))
(global-var
(case (global-var-kind leaf)
- (:global-function
+ (:global-function
(let ((name (leaf-source-name leaf)))
(or #-sb-xc-host
(eq (symbol-package (fun-name-block-name name))
(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)))
+ (dest (lvar-dest lvar))
+ (dest-lvar (when (valued-node-p dest) (node-lvar dest))))
(when (and
;; Think about (LET ((A ...)) (IF ... A ...)): two
- ;; LVAR-USEs should not be met on one path.
+ ;; LVAR-USEs should not be met on one path. Another problem
+ ;; is with dynamic-extent.
(eq (lvar-uses lvar) ref)
+ (not (block-delete-p (node-block ref)))
+ ;; If the destinatation is dynamic extent, don't substitute unless
+ ;; the source is as well.
+ (or (not dest-lvar)
+ (not (lvar-dynamic-extent dest-lvar))
+ (lvar-dynamic-extent lvar))
(typecase dest
;; we should not change lifetime of unknown values lvars
(cast
t))
(eq (node-home-lambda ref)
(lambda-home (lambda-var-home var))))
+ (let ((ref-type (single-value-type (node-derived-type ref))))
+ (cond ((csubtypep (single-value-type (lvar-type arg)) ref-type)
+ (substitute-lvar-uses lvar arg
+ ;; Really it is (EQ (LVAR-USES LVAR) REF):
+ t)
+ (delete-lvar-use ref))
+ (t
+ (let* ((value (make-lvar))
+ (cast (insert-cast-before ref value ref-type
+ ;; KLUDGE: it should be (TYPE-CHECK 0)
+ *policy*)))
+ (setf (cast-type-to-check cast) *wild-type*)
+ (substitute-lvar-uses value arg
+ ;; FIXME
+ t)
+ (%delete-lvar-use ref)
+ (add-lvar-use cast lvar)))))
(setf (node-derived-type ref) *wild-type*)
- (substitute-lvar-uses lvar arg)
- (delete-lvar-use ref)
(change-ref-leaf ref (find-constant nil))
(delete-ref ref)
(unlink-node ref)
(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
+ and var in (lambda-vars fun) do
(when (and arg (lvar-reoptimize arg))
(setf (lvar-reoptimize arg) nil)
(cond
leaf var)))
t)))))
((and (null (rest (leaf-refs var)))
+ (not (preserve-single-use-debug-var-p call var))
(substitute-single-use-lvar arg var)))
(t
(propagate-to-refs var (lvar-type arg))))))
;;; variable, we compute the union of the types across all calls and
;;; propagate this type information to the var's refs.
;;;
-;;; If the function has an XEP, then we don't do anything, since we
-;;; won't discover anything.
+;;; If the function has an entry-fun, then we don't do anything: since
+;;; it has a XEP we would not discover anything.
+;;;
+;;; If the function is an optional-entry-point, we will just make sure
+;;; &REST lists are known to be lists. Doing the regular rigamarole
+;;; can erronously propagate too strict types into refs: see
+;;; BUG-655203-REGRESSION in tests/compiler.pure.lisp.
;;;
;;; We can clear the LVAR-REOPTIMIZE flags for arguments in all calls
;;; corresponding to changed arguments in CALL, since the only use in
;;; right here.
(defun propagate-local-call-args (call fun)
(declare (type combination call) (type clambda fun))
-
- (unless (or (functional-entry-fun fun)
- (lambda-optional-dispatch fun))
- (let* ((vars (lambda-vars fun))
- (union (mapcar (lambda (arg var)
- (when (and arg
- (lvar-reoptimize arg)
- (null (basic-var-sets var)))
- (lvar-type arg)))
- (basic-combination-args call)
- vars))
- (this-ref (lvar-use (basic-combination-fun call))))
-
- (dolist (arg (basic-combination-args call))
- (when arg
- (setf (lvar-reoptimize arg) nil)))
-
- (dolist (ref (leaf-refs fun))
- (let ((dest (node-dest ref)))
- (unless (or (eq ref this-ref) (not dest))
- (setq union
- (mapcar (lambda (this-arg old)
- (when old
- (setf (lvar-reoptimize this-arg) nil)
- (type-union (lvar-type this-arg) old)))
- (basic-combination-args dest)
- union)))))
-
- (loop for var in vars
- and type in union
- when type do (propagate-to-refs var type))))
+ (unless (functional-entry-fun fun)
+ (if (lambda-optional-dispatch fun)
+ ;; We can still make sure &REST is known to be a list.
+ (loop for var in (lambda-vars fun)
+ do (let ((info (lambda-var-arg-info var)))
+ (when (and info (eq :rest (arg-info-kind info)))
+ (propagate-from-sets var (specifier-type 'list)))))
+ ;; The normal case.
+ (let* ((vars (lambda-vars fun))
+ (union (mapcar (lambda (arg var)
+ (when (and arg
+ (lvar-reoptimize arg)
+ (null (basic-var-sets var)))
+ (lvar-type arg)))
+ (basic-combination-args call)
+ vars))
+ (this-ref (lvar-use (basic-combination-fun call))))
+
+ (dolist (arg (basic-combination-args call))
+ (when arg
+ (setf (lvar-reoptimize arg) nil)))
+
+ (dolist (ref (leaf-refs fun))
+ (let ((dest (node-dest ref)))
+ (unless (or (eq ref this-ref) (not dest))
+ (setq union
+ (mapcar (lambda (this-arg old)
+ (when old
+ (setf (lvar-reoptimize this-arg) nil)
+ (type-union (lvar-type this-arg) old)))
+ (basic-combination-args dest)
+ union)))))
+
+ (loop for var in vars
+ and type in union
+ when type do (propagate-to-refs var type)))))
(values))
\f
(:local
(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 (lvar-reoptimize fun-lvar) nil)
+ (maybe-let-convert (combination-lambda node))))
(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))))
+ (ir1-optimize-mv-bind node))))
(:full
(let* ((fun (basic-combination-fun node))
- (fun-changed (lvar-reoptimize fun))
- (args (basic-combination-args node)))
+ (fun-changed (lvar-reoptimize fun))
+ (args (basic-combination-args node)))
(when fun-changed
- (setf (lvar-reoptimize fun) nil)
- (let ((type (lvar-type fun)))
- (when (fun-type-p type)
- (derive-node-type node (fun-type-returns type))))
+ (setf (lvar-reoptimize fun) nil)
+ (let ((type (lvar-type fun)))
+ (when (fun-type-p type)
+ (derive-node-type node (fun-type-returns type))))
(maybe-terminate-block node nil)
- (let ((use (lvar-uses fun)))
- (when (and (ref-p use) (functional-p (ref-leaf use)))
- (convert-call-if-possible use node)
- (when (eq (basic-combination-kind node) :local)
- (maybe-let-convert (ref-leaf use))))))
+ (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 (lvar-fun-name fun) '%throw))
- (ir1-optimize-mv-call node))
+ (eq (lvar-fun-name fun) '%throw))
+ (ir1-optimize-mv-call node))
(dolist (arg args)
- (setf (lvar-reoptimize arg) nil))))
+ (setf (lvar-reoptimize arg) nil))))
(:error))
(values))
;;; multiple warnings when there is an argument count error.
(defun ir1-optimize-mv-call (node)
(let ((fun (basic-combination-fun node))
- (*compiler-error-context* node)
- (ref (lvar-uses (basic-combination-fun node)))
- (args (basic-combination-args node)))
+ (*compiler-error-context* node)
+ (ref (lvar-uses (basic-combination-fun node)))
+ (args (basic-combination-args node)))
(unless (and (ref-p ref) (constant-reference-p ref)
- (singleton-p args))
+ (singleton-p args))
(return-from ir1-optimize-mv-call))
(multiple-value-bind (min max)
- (fun-type-nargs (lvar-type fun))
+ (fun-type-nargs (lvar-type fun))
(let ((total-nvals
- (multiple-value-bind (types nvals)
- (values-types (lvar-derived-type (first args)))
- (declare (ignore types))
- (if (eq nvals :unknown) nil nvals))))
-
- (when total-nvals
- (when (and min (< total-nvals min))
- (compiler-warn
- "MULTIPLE-VALUE-CALL with ~R values when the function expects ~
- at least ~R."
- total-nvals min)
- (setf (basic-combination-kind node) :error)
- (return-from ir1-optimize-mv-call))
- (when (and max (> total-nvals max))
- (compiler-warn
- "MULTIPLE-VALUE-CALL with ~R values when the function expects ~
- at most ~R."
- total-nvals max)
- (setf (basic-combination-kind node) :error)
- (return-from ir1-optimize-mv-call)))
-
- (let ((count (cond (total-nvals)
- ((and (policy node (zerop verify-arg-count))
- (eql min max))
- min)
- (t nil))))
- (when count
- (with-ir1-environment-from-node node
- (let* ((dums (make-gensym-list count))
- (ignore (gensym))
- (fun (ir1-convert-lambda
- `(lambda (&optional ,@dums &rest ,ignore)
- (declare (ignore ,ignore))
- (funcall ,(ref-leaf ref) ,@dums)))))
- (change-ref-leaf ref fun)
- (aver (eq (basic-combination-kind node) :full))
- (locall-analyze-component *current-component*)
- (aver (eq (basic-combination-kind node) :local)))))))))
+ (multiple-value-bind (types nvals)
+ (values-types (lvar-derived-type (first args)))
+ (declare (ignore types))
+ (if (eq nvals :unknown) nil nvals))))
+
+ (when total-nvals
+ (when (and min (< total-nvals min))
+ (compiler-warn
+ "MULTIPLE-VALUE-CALL with ~R values when the function expects ~
+ at least ~R."
+ total-nvals min)
+ (setf (basic-combination-kind node) :error)
+ (return-from ir1-optimize-mv-call))
+ (when (and max (> total-nvals max))
+ (compiler-warn
+ "MULTIPLE-VALUE-CALL with ~R values when the function expects ~
+ at most ~R."
+ total-nvals max)
+ (setf (basic-combination-kind node) :error)
+ (return-from ir1-optimize-mv-call)))
+
+ (let ((count (cond (total-nvals)
+ ((and (policy node (zerop verify-arg-count))
+ (eql min max))
+ min)
+ (t nil))))
+ (when count
+ (with-ir1-environment-from-node node
+ (let* ((dums (make-gensym-list count))
+ (ignore (gensym))
+ (leaf (ref-leaf ref))
+ (fun (ir1-convert-lambda
+ `(lambda (&optional ,@dums &rest ,ignore)
+ (declare (ignore ,ignore))
+ (%funcall ,leaf ,@dums))
+ :source-name (leaf-%source-name leaf)
+ :debug-name (leaf-%debug-name leaf))))
+ (change-ref-leaf ref fun)
+ (aver (eq (basic-combination-kind node) :full))
+ (locall-analyze-component *current-component*)
+ (aver (eq (basic-combination-kind node) :local)))))))))
(values))
;;; If we see:
;;; (multiple-value-bind
-;;; (x y)
-;;; (values xx yy)
+;;; (x y)
+;;; (values xx yy)
;;; ...)
;;; Convert to:
;;; (let ((x xx)
-;;; (y yy))
+;;; (y yy))
;;; ...)
;;;
;;; What we actually do is convert the VALUES combination into a
(defun convert-mv-bind-to-let (call)
(declare (type mv-combination call))
(let* ((arg (first (basic-combination-args call)))
- (use (lvar-uses arg)))
+ (use (lvar-uses arg)))
(when (and (combination-p use)
- (eq (lvar-fun-name (combination-fun use))
- 'values))
+ (eq (lvar-fun-name (combination-fun use))
+ 'values))
(let* ((fun (combination-lambda call))
- (vars (lambda-vars fun))
- (vals (combination-args use))
- (nvars (length vars))
- (nvals (length vals)))
- (cond ((> nvals nvars)
- (mapc #'flush-dest (subseq vals nvars))
- (setq vals (subseq vals 0 nvars)))
- ((< nvals nvars)
- (with-ir1-environment-from-node use
- (let ((node-prev (node-prev use)))
- (setf (node-prev use) nil)
- (setf (ctran-next node-prev) nil)
- (collect ((res vals))
- (loop for count below (- nvars nvals)
- for prev = node-prev then ctran
+ (vars (lambda-vars fun))
+ (vals (combination-args use))
+ (nvars (length vars))
+ (nvals (length vals)))
+ (cond ((> nvals nvars)
+ (mapc #'flush-dest (subseq vals nvars))
+ (setq vals (subseq vals 0 nvars)))
+ ((< nvals nvars)
+ (with-ir1-environment-from-node use
+ (let ((node-prev (node-prev use)))
+ (setf (node-prev use) nil)
+ (setf (ctran-next node-prev) nil)
+ (collect ((res 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)
+ 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-lvar (basic-combination-fun call)))
- (setf (lvar-dest fun-lvar) use)
+ (setq vals (res)))))))
+ (setf (combination-args use) vals)
+ (flush-dest (combination-fun use))
+ (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-lvar (first vals)))
- (propagate-to-args use fun)
+ (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-lvar (first vals)))
+ ;; Propagate derived types from the VALUES call to its args:
+ ;; transforms can leave the VALUES call with a better type
+ ;; than its args have, so make sure not to throw that away.
+ (let ((types (values-type-types (node-derived-type use))))
+ (dolist (val vals)
+ (when types
+ (let ((type (pop types)))
+ (assert-lvar-type val type '((type-check . 0)))))))
+ ;; Propagate declared types of MV-BIND variables.
+ (propagate-to-args use fun)
(reoptimize-call use))
t)))
(defoptimizer (values-list optimizer) ((list) node)
(let ((use (lvar-uses list)))
(when (and (combination-p use)
- (eq (lvar-fun-name (combination-fun use))
- 'list))
+ (eq (lvar-fun-name (combination-fun use))
+ 'list))
;; 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"))
+ (find-free-fun 'values "in a strange place"))
(setf (combination-kind node) :full)
(let ((args (combination-args use)))
- (dolist (arg args)
- (setf (lvar-dest arg) node)
+ (dolist (arg args)
+ (setf (lvar-dest arg) node)
(flush-lvar-externally-checkable-type arg))
- (setf (combination-args use) nil)
- (flush-dest list)
- (setf (combination-args node) args))
+ (setf (combination-args use) nil)
+ (flush-dest list)
+ (flush-combination use)
+ (setf (combination-args node) args))
t)))
;;; If VALUES appears in a non-MV context, then effectively convert it
(principal-lvar-single-valuify (node-lvar node))
(if vals
(let ((dummies (make-gensym-list (length (cdr vals)))))
- `(lambda (val ,@dummies)
- (declare (ignore ,@dummies))
- val))
+ `(lambda (val ,@dummies)
+ (declare (ignore ,@dummies))
+ val))
nil))
;;; TODO:
;;; - CAST chains;
+(defun delete-cast (cast)
+ (declare (type cast cast))
+ (let ((value (cast-value cast))
+ (lvar (node-lvar cast)))
+ (delete-filter cast lvar value)
+ (when lvar
+ (reoptimize-lvar lvar)
+ (when (lvar-single-value-p lvar)
+ (note-single-valuified-lvar lvar)))
+ (values)))
+
(defun ir1-optimize-cast (cast &optional do-not-optimize)
(declare (type cast cast))
(let ((value (cast-value cast))
(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)))
+ (delete-cast cast)
(return-from ir1-optimize-cast t))
(when (and (listp (lvar-uses value))
(immediately-used-p value use))
(unless next-block
(when ctran (ensure-block-start ctran))
- (setq next-block (first (block-succ (node-block cast)))))
+ (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))
(unless (eq value-type *empty-type*)
;; FIXME: Do it in one step.
- (filter-lvar
- value
- `(multiple-value-call #'list 'dummy))
- (filter-lvar
- (cast-value cast)
- ;; FIXME: Derived type.
- `(%compile-time-type-error 'dummy
- ',(type-specifier atype)
- ',(type-specifier value-type)))
+ (let ((context (cons (node-source-form cast)
+ (lvar-all-sources (cast-value cast)))))
+ (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)
+ ',context)))
;; 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
(unless do-not-optimize
(setf (node-reoptimize cast) nil)))
+
+(deftransform make-symbol ((string) (simple-string))
+ `(%make-symbol string))
projects / sbcl.git / blobdiff