X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fcheckgen.lisp;h=6ada02bec16ae14c05b97aca7ee7f9b27a8f5fda;hb=c41d75f1d2defd6234e644ef2b40440a5d1526c5;hp=01f8e299e1c635f62e06c8fafd4e37bc360ff056;hpb=d40a76606c86722b0aef8179155f9f2840739b72;p=sbcl.git diff --git a/src/compiler/checkgen.lisp b/src/compiler/checkgen.lisp index 01f8e29..6ada02b 100644 --- a/src/compiler/checkgen.lisp +++ b/src/compiler/checkgen.lisp @@ -29,7 +29,7 @@ (let ((info (info :function :info name)) (call-cost (template-cost (template-or-lose 'call-named)))) (if info - (let ((templates (function-info-templates info))) + (let ((templates (fun-info-templates info))) (if templates (template-cost (first templates)) (case name @@ -185,7 +185,7 @@ ;;; ;;; A type is checkable if it either represents a fixed number of ;;; values (as determined by VALUES-TYPES), or it is the assertion for -;;; an MV-Bind. A type is simply checkable if all the type assertions +;;; an MV-BIND. A type is simply checkable if all the type assertions ;;; have a TYPE-CHECK-TEMPLATE. In this :SIMPLE case, the second value ;;; is a list of the type restrictions specified for the leading ;;; positional values. @@ -240,8 +240,8 @@ ;;; -- 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 -;;; no IR2-Convert method or :FAST-SAFE templates that are +;;; -- the continuation 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. ;;; ;;; We must only return NIL when it is *certain* that a check will not @@ -250,38 +250,43 @@ ;;; type checks. The penalty for erring by being too speculative is ;;; much nastier, e.g. falling through without ever being able to find ;;; an appropriate VOP. -;;; -;;; If there is a compile-time type error, then we always return true -;;; unless the DEST is a full call. With a full call, the theory is -;;; that the type error is probably 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 the error -;;; is really in the callee, not the caller. We don't want to make -;;; people recompile all calls to a function when they were originally -;;; compiled with a bad declaration (or an old type assertion derived -;;; from a definition appearing after the call.) (defun probable-type-check-p (cont) (declare (type continuation cont)) (let ((dest (continuation-dest cont))) - (cond ((eq (continuation-type-check cont) :error) - (if (and (combination-p dest) - (eq (combination-kind dest) :error)) - nil - t)) - ((or (not dest) + (cond ((or (not dest) (policy dest (zerop safety))) nil) ((basic-combination-p dest) (let ((kind (basic-combination-kind dest))) (cond ((eq cont (basic-combination-fun dest)) t) ((eq kind :local) t) - ((member kind '(:full :error)) nil) - ((function-info-ir2-convert kind) t) + ((not (eq (continuation-asserted-type cont) + (continuation-externally-checkable-type cont))) + ;; There is an explicit assertion. + t) + ((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.) + nil) + + ((eq kind :error) nil) + ;; :ERROR means that we have an invalid syntax of + ;; the call and the callee will detect it before + ;; thinking about types. + + ((fun-info-ir2-convert kind) t) (t - (dolist (template (function-info-templates kind) nil) + (dolist (template (fun-info-templates kind) nil) (when (eq (template-ltn-policy template) :fast-safe) (multiple-value-bind (val win) - (valid-function-use dest (template-type template)) + (valid-fun-use dest (template-type template)) (when (or val (not win)) (return t))))))))) (t t)))) @@ -361,7 +366,7 @@ ;; said that somewhere in here we ;; Set the new block's start and end cleanups to the *start* ;; cleanup of PREV's block. This overrides the incorrect - ;; default from WITH-BELATED-IR1-ENVIRONMENT. + ;; default from WITH-IR1-ENVIRONMENT-FROM-NODE. ;; Unfortunately I can't find any code which corresponds to this. ;; Perhaps it was a stale comment? Or perhaps I just don't ;; understand.. -- WHN 19990521 @@ -404,7 +409,7 @@ ;;; context. If the value is a constant, we print it specially. We ;;; ignore nodes whose type is NIL, since they are supposed to never ;;; return. -(defun do-type-warning (node) +(defun emit-type-warning (node) (declare (type node node)) (let* ((*compiler-error-context* node) (cont (node-cont node)) @@ -430,25 +435,6 @@ what (type-specifier dtype) atype-spec)))) (values)) -;;; Mark CONT as being a continuation with a manifest type error. We -;;; set the kind to :ERROR, and clear any FUNCTION-INFO if the -;;; continuation is an argument to a known call. The last is done so -;;; that the back end doesn't have to worry about type errors in -;;; arguments to known functions. This clearing is inhibited for -;;; things with IR2-CONVERT methods, since we can't do a full call to -;;; funny functions. -(defun mark-error-continuation (cont) - (declare (type continuation cont)) - (setf (continuation-%type-check cont) :error) - (let ((dest (continuation-dest cont))) - (when (and (combination-p dest) - (let ((kind (basic-combination-kind dest))) - (or (eq kind :full) - (and (function-info-p kind) - (not (function-info-ir2-convert kind)))))) - (setf (basic-combination-kind dest) :error))) - (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 @@ -484,14 +470,13 @@ (when (block-type-check block) (do-nodes (node cont block) (let ((type-check (continuation-type-check cont))) - (unless (member type-check '(nil :error :deleted)) + (unless (member type-check '(nil :deleted)) (let ((atype (continuation-asserted-type cont))) (do-uses (use cont) (unless (values-types-equal-or-intersect (node-derived-type use) atype) - (mark-error-continuation cont) (unless (policy node (= inhibit-warnings 3)) - (do-type-warning use)))))) + (emit-type-warning use)))))) (when (eq type-check t) (cond ((probable-type-check-p cont) (conts cont))