;;; FIXME: I don't quite understand this, but it looks as though
;;; that means type checks are weakened when SPEED=3 regardless of
;;; the SAFETY level, which is not the right thing to do.
-(defun maybe-negate-check (cont types original-types force-hairy)
- (declare (type continuation cont) (list types))
+(defun maybe-negate-check (lvar types original-types force-hairy)
+ (declare (type lvar lvar) (list types))
(multiple-value-bind (ptypes count)
- (no-fun-values-types (continuation-derived-type cont))
+ (no-fun-values-types (lvar-derived-type lvar))
(if (eq count :unknown)
(if (and (every #'type-check-template types) (not force-hairy))
(values :simple types)
;;; negation of this type instead.
(defun cast-check-types (cast force-hairy)
(declare (type cast cast))
- (let* ((cont (node-cont cast))
- (ctype (coerce-to-values (cast-type-to-check cast)))
+ (let* ((ctype (coerce-to-values (cast-type-to-check cast)))
(atype (coerce-to-values (cast-asserted-type cast)))
(value (cast-value cast))
- (vtype (continuation-derived-type value))
- (dest (continuation-dest cont)))
+ (vtype (lvar-derived-type value))
+ (lvar (node-lvar cast))
+ (dest (and lvar (lvar-dest lvar))))
(aver (not (eq ctype *wild-type*)))
(multiple-value-bind (ctypes count) (no-fun-values-types ctype)
(multiple-value-bind (atypes acount) (no-fun-values-types atype)
(eq count :unknown))))
(maybe-negate-check value ctypes atypes t)
(maybe-negate-check value ctypes atypes force-hairy)))
- ((and (continuation-single-value-p cont)
+ ((and (lvar-single-value-p lvar)
(or (not (args-type-rest ctype))
(eq (args-type-rest ctype) *universal-type*)))
+ (principal-lvar-single-valuify lvar)
(let ((creq (car (args-type-required ctype))))
(multiple-value-setq (ctype atype)
(if creq
force-hairy)))
((and (mv-combination-p dest)
(eq (mv-combination-kind dest) :local))
- (let* ((fun-ref (continuation-use (mv-combination-fun dest)))
+ (let* ((fun-ref (lvar-use (mv-combination-fun dest)))
(length (length (lambda-vars (ref-leaf fun-ref)))))
(maybe-negate-check value
;; FIXME
force-hairy)))
((not (eq vcount :unknown))
(maybe-negate-check value
- (values-type-start ctype vcount)
- (values-type-start atype vcount)
+ (values-type-out ctype vcount)
+ (values-type-out atype vcount)
t))
(t
(values :too-hairy nil))))))))
;;; Do we want to do a type check?
(defun worth-type-check-p (cast)
(declare (type cast cast))
- (let* ((cont (node-cont cast))
- (dest (continuation-dest cont)))
- (not (or (not (cast-type-check cast))
- (and (combination-p dest)
- (let ((kind (combination-kind dest)))
- (or (eq kind :full)
- ;; The theory is that the type assertion is
- ;; from a declaration in (or on) the callee,
- ;; so the callee should be able to do the
- ;; check. We want to let the callee do the
- ;; check, because it is possible that by the
- ;; time of call that declaration will be
- ;; changed and we do not want to make people
- ;; recompile all calls to a function when they
- ;; were originally compiled with a bad
- ;; declaration. (See also bug 35.)
- (and (fun-info-p kind)
- (null (fun-info-templates kind))
- (not (fun-info-ir2-convert kind)))))
- (and
- (immediately-used-p cont cast)
- (values-subtypep (continuation-externally-checkable-type cont)
- (cast-type-to-check cast))))))))
+ (let* ((lvar (node-lvar cast))
+ (dest (and lvar (lvar-dest lvar))))
+ (cond ((not (cast-type-check cast))
+ nil)
+ ((and (combination-p dest)
+ (call-full-like-p dest)
+ ;; The theory is that the type assertion is
+ ;; from a declaration in (or on) the callee,
+ ;; so the callee should be able to do the
+ ;; check. We want to let the callee do the
+ ;; check, because it is possible that by the
+ ;; time of call that declaration will be
+ ;; changed and we do not want to make people
+ ;; recompile all calls to a function when they
+ ;; were originally compiled with a bad
+ ;; declaration. (See also bug 35.)
+ (immediately-used-p lvar cast)
+ (values-subtypep (lvar-externally-checkable-type lvar)
+ (cast-type-to-check cast)))
+ nil)
+ (t
+ t))))
;;; Return true if CONT is a continuation whose type the back end is
;;; likely to want to check. Since we don't know what template the
;;; compatible with the call's type.
(defun probable-type-check-p (cast)
(declare (type cast cast))
- (let* ((cont (node-cont cast))
- (dest (continuation-dest cont)))
+ (let* ((lvar (node-lvar cast))
+ (dest (and lvar (lvar-dest lvar))))
(cond ((not dest) nil)
(t t))
#+nil
;;; passes them on to CONT.
(defun convert-type-check (cast types)
(declare (type cast cast) (type list types))
- (let ((cont (cast-value cast))
+ (let ((value (cast-value cast))
(length (length types)))
- (filter-continuation cont (make-type-check-form types))
- (reoptimize-continuation (cast-value cast))
+ (filter-lvar value (make-type-check-form types))
+ (reoptimize-lvar (cast-value cast))
(setf (cast-type-to-check cast) *wild-type*)
(setf (cast-%type-check cast) nil)
(let* ((atype (cast-asserted-type cast))
((= length 1)
(single-value-type atype))
(t
- (make-values-type :required
- (values-type-start atype length)))))
+ (make-values-type
+ :required (values-type-out atype length)))))
(dtype (node-derived-type cast))
- (dtype (make-values-type :required
- (values-type-start dtype length))))
+ (dtype (make-values-type
+ :required (values-type-out dtype length))))
(setf (cast-asserted-type cast) atype)
(setf (node-derived-type cast) dtype)))
;;; the value is a constant, we print it specially.
(defun cast-check-uses (cast)
(declare (type cast cast))
- (let* ((cont (node-cont cast))
- (dest (continuation-dest cont))
+ (let* ((lvar (node-lvar cast))
+ (dest (and lvar (lvar-dest lvar)))
(value (cast-value cast))
(atype (cast-asserted-type cast)))
(do-uses (use value)
(eq (combination-kind dest) :local))
(let ((lambda (combination-lambda dest))
(pos (position-or-lose
- cont (combination-args dest))))
+ lvar (combination-args dest))))
(format nil "~:[A possible~;The~] binding of ~S"
- (and (continuation-use cont)
+ (and (lvar-has-single-use-p lvar)
(eq (functional-kind lambda) :let))
(leaf-source-name (elt (lambda-vars lambda)
pos)))))))
(collect ((casts))
(do-blocks (block component)
(when (block-type-check block)
- (do-nodes (node cont block)
- (when (cast-p node)
- (when (cast-type-check node)
- (cast-check-uses node))
+ (do-nodes (node nil block)
+ (when (and (cast-p node)
+ (cast-type-check node))
+ (cast-check-uses node)
(cond ((worth-type-check-p node)
(casts (cons node (not (probable-type-check-p node)))))
(t
(:too-hairy
(let ((*compiler-error-context* cast))
(when (policy cast (>= safety inhibit-warnings))
- (compiler-note
+ (compiler-notify
"type assertion too complex to check:~% ~S."
- (type-specifier (cast-asserted-type cast)))))
+ (type-specifier (coerce-to-values (cast-asserted-type cast))))))
(setf (cast-type-to-check cast) *wild-type*)
(setf (cast-%type-check cast) nil)))))))
(values))
projects / sbcl.git / blobdiff