;;; Switch to disable check complementing, for evaluation.
(defvar *complement-type-checks* t)
-;;; CONT is a continuation we are doing a type check on and TYPES is a
-;;; list of types that we are checking its values against. If we have
-;;; proven that CONT generates a fixed number of values, then for each
+;;; LVAR is an lvar we are doing a type check on and TYPES is a list
+;;; of types that we are checking its values against. If we have
+;;; proven that LVAR generates a fixed number of values, then for each
;;; value, we check whether it is cheaper to then difference between
;;; the proven type and the corresponding type in TYPES. If so, we opt
;;; for a :HAIRY check with that test negated. Otherwise, we try to do
;;; 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)
(t
(values :hairy res)))))))
-;;; Determines whether CONT's assertion is:
+;;; Determines whether CAST's assertion is:
;;; -- checkable by the back end (:SIMPLE), or
;;; -- not checkable by the back end, but checkable via an explicit
;;; test in type check conversion (:HAIRY), or
;;; We force a check to be hairy even when there are fixed values if
;;; we are in a context where we may be forced to use the unknown
;;; values convention anyway. This is because IR2tran can't generate
-;;; type checks for unknown values continuations but people could
-;;; still be depending on the check being done. We only care about
-;;; EXIT and RETURN (not MV-COMBINATION) since these are the only
-;;; contexts where the ultimate values receiver
+;;; type checks for unknown values lvars but people could still be
+;;; depending on the check being done. We only care about EXIT and
+;;; RETURN (not MV-COMBINATION) since these are the only contexts
+;;; where the ultimate values receiver
;;;
;;; In the :HAIRY case, the second value is a list of triples of
;;; the form:
;;;
;;; If true, the NOT-P flag indicates a test that the corresponding
;;; value is *not* of the specified TYPE. ORIGINAL-TYPE is the type
-;;; asserted on this value in the continuation, for use in error
+;;; asserted on this value in the lvar, for use in error
;;; messages. When NOT-P is true, this will be different from TYPE.
;;;
-;;; This allows us to take what has been proven about CONT's type into
-;;; consideration. If it is cheaper to test for the difference between
-;;; the derived type and the asserted type, then we check for the
-;;; negation of this type instead.
+;;; This allows us to take what has been proven about CAST's argument
+;;; type into consideration. If it is cheaper to test for the
+;;; difference between the derived type and the asserted type, then we
+;;; check for the 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
+;;; Return true if CAST's value is an lvar whose type the back end is
;;; likely to want to check. Since we don't know what template the
;;; back end is going to choose to implement the continuation's DEST,
;;; we use a heuristic. We always return T unless:
;;; -- nobody uses the value, or
;;; -- safety is totally unimportant, or
-;;; -- the continuation is an argument to an unknown function, or
-;;; -- the continuation is an argument to a known function that has
+;;; -- the lvar is an argument to an unknown function, or
+;;; -- the lvar is an argument to a known function that has
;;; no IR2-CONVERT method or :FAST-SAFE templates that are
;;; 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
;;; Return a lambda form that we can convert to do a hairy type check
;;; of the specified TYPES. TYPES is a list of the format returned by
-;;; CONTINUATION-CHECK-TYPES in the :HAIRY case.
+;;; LVAR-CHECK-TYPES in the :HAIRY case.
;;;
;;; Note that we don't attempt to check for required values being
;;; unsupplied. Such checking is impossible to efficiently do at the
types)
(values ,@temps))))
-;;; Splice in explicit type check code immediately before the node
-;;; which is CONT's DEST. This code receives the value(s) that were
-;;; being passed to CONT, checks the type(s) of the value(s), then
-;;; passes them on to CONT.
+;;; Splice in explicit type check code immediately before CAST. This
+;;; code receives the value(s) that were being passed to CAST-VALUE,
+;;; checks the type(s) of the value(s), then passes them further.
(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)))))))
(values))
;;; Loop over all blocks in COMPONENT that have TYPE-CHECK set,
-;;; looking for continuations with TYPE-CHECK T. We do two mostly
-;;; unrelated things: detect compile-time type errors and determine if
-;;; and how to do run-time type checks.
+;;; looking for CASTs with TYPE-CHECK T. We do two mostly unrelated
+;;; things: detect compile-time type errors and determine if and how
+;;; to do run-time type checks.
;;;
-;;; If there is a compile-time type error, then we mark the
-;;; continuation and emit a warning if appropriate. This part loops
-;;; over all the uses of the continuation, since after we convert the
-;;; check, the :DELETED kind will inhibit warnings about the types of
-;;; other uses.
+;;; If there is a compile-time type error, then we mark the CAST and
+;;; emit a warning if appropriate. This part loops over all the uses
+;;; of the continuation, since after we convert the check, the
+;;; :DELETED kind will inhibit warnings about the types of other uses.
;;;
-;;; If a continuation is too complex to be checked by the back end, or
-;;; is better checked with explicit code, then convert to an explicit
+;;; If the cast is too complex to be checked by the back end, or is
+;;; better checked with explicit code, then convert to an explicit
;;; test. Assertions that can checked by the back end are passed
;;; through. Assertions that can't be tested are flamed about and
;;; marked as not needing to be checked.
(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