X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fcheckgen.lisp;h=6ada02bec16ae14c05b97aca7ee7f9b27a8f5fda;hb=c41d75f1d2defd6234e644ef2b40440a5d1526c5;hp=3441ad69af727571dd733285a7e80842de2dc057;hpb=a8fa26a6e9804d3548f5bca9361a91345a689099;p=sbcl.git diff --git a/src/compiler/checkgen.lisp b/src/compiler/checkgen.lisp index 3441ad6..6ada02b 100644 --- a/src/compiler/checkgen.lisp +++ b/src/compiler/checkgen.lisp @@ -24,12 +24,12 @@ ;;; ;;; We special-case NULL, since it does have a source tranform and is ;;; interesting to us. -(defun function-cost (name) +(defun fun-guessed-cost (name) (declare (symbol name)) (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 @@ -49,29 +49,29 @@ (let ((found (cdr (assoc type *backend-type-predicates* :test #'type=)))) (if found - (+ (function-cost found) (function-cost 'eq)) + (+ (fun-guessed-cost found) (fun-guessed-cost 'eq)) nil)))) (typecase type (compound-type (reduce #'+ (compound-type-types type) :key 'type-test-cost)) (member-type (* (length (member-type-members type)) - (function-cost 'eq))) + (fun-guessed-cost 'eq))) (numeric-type (* (if (numeric-type-complexp type) 2 1) - (function-cost + (fun-guessed-cost (if (csubtypep type (specifier-type 'fixnum)) 'fixnump 'numberp)) (+ 1 (if (numeric-type-low type) 1 0) (if (numeric-type-high type) 1 0)))) (cons-type (+ (type-test-cost (specifier-type 'cons)) - (function-cost 'car) + (fun-guessed-cost 'car) (type-test-cost (cons-type-car-type type)) - (function-cost 'cdr) + (fun-guessed-cost 'cdr) (type-test-cost (cons-type-cdr-type type)))) (t - (function-cost 'typep))))) + (fun-guessed-cost 'typep))))) ;;;; checking strategy determination @@ -109,14 +109,15 @@ min-type *universal-type*))))) -;;; Like VALUES-TYPES, only mash any complex function types to FUNCTION. -(defun no-function-values-types (type) +;;; This is like VALUES-TYPES, only we mash any complex function types +;;; to FUNCTION. +(defun no-fun-values-types (type) (declare (type ctype type)) (multiple-value-bind (res count) (values-types type) - (values (mapcar #'(lambda (type) - (if (function-type-p type) - (specifier-type 'function) - type)) + (values (mapcar (lambda (type) + (if (fun-type-p type) + (specifier-type 'function) + type)) res) count))) @@ -130,7 +131,7 @@ ;;; 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 ;;; a simple test, and if that is impossible, we do a hairy test with -;;; non-negated types. If true, Force-Hairy forces a hairy type check. +;;; non-negated types. If true, FORCE-HAIRY forces a hairy type check. ;;; ;;; When doing a non-negated check, we call MAYBE-WEAKEN-CHECK to ;;; weaken the test to a convenient supertype (conditional on policy.) @@ -145,23 +146,23 @@ (defun maybe-negate-check (cont types force-hairy) (declare (type continuation cont) (list types)) (multiple-value-bind (ptypes count) - (no-function-values-types (continuation-proven-type cont)) + (no-fun-values-types (continuation-proven-type cont)) (if (eq count :unknown) (if (and (every #'type-check-template types) (not force-hairy)) (values :simple types) (values :hairy - (mapcar #'(lambda (x) - (list nil (maybe-weaken-check x cont) x)) + (mapcar (lambda (x) + (list nil (maybe-weaken-check x cont) x)) types))) - (let ((res (mapcar #'(lambda (p c) - (let ((diff (type-difference p c)) - (weak (maybe-weaken-check c cont))) - (if (and diff - (< (type-test-cost diff) - (type-test-cost weak)) - *complement-type-checks*) - (list t diff c) - (list nil weak c)))) + (let ((res (mapcar (lambda (p c) + (let ((diff (type-difference p c)) + (weak (maybe-weaken-check c cont))) + (if (and diff + (< (type-test-cost diff) + (type-test-cost weak)) + *complement-type-checks*) + (list t diff c) + (list nil weak c)))) ptypes types))) (cond ((or force-hairy (find-if #'first res)) (values :hairy res)) @@ -184,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. @@ -215,7 +216,7 @@ (let ((type (continuation-asserted-type cont)) (dest (continuation-dest cont))) (aver (not (eq type *wild-type*))) - (multiple-value-bind (types count) (no-function-values-types type) + (multiple-value-bind (types count) (no-fun-values-types type) (cond ((not (eq count :unknown)) (if (or (exit-p dest) (and (return-p dest) @@ -239,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 @@ -249,37 +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)))) @@ -299,15 +306,15 @@ (defun make-type-check-form (types) (let ((temps (make-gensym-list (length types)))) `(multiple-value-bind ,temps 'dummy - ,@(mapcar #'(lambda (temp type) - (let* ((spec - (let ((*unparse-function-type-simplify* t)) - (type-specifier (second type)))) - (test (if (first type) `(not ,spec) spec))) - `(unless (typep ,temp ',test) - (%type-check-error - ,temp - ',(type-specifier (third type)))))) + ,@(mapcar (lambda (temp type) + (let* ((spec + (let ((*unparse-fun-type-simplify* t)) + (type-specifier (second type)))) + (test (if (first type) `(not ,spec) spec))) + `(unless (typep ,temp ',test) + (%type-check-error + ,temp + ',(type-specifier (third type)))))) temps types) (values ,@temps)))) @@ -318,7 +325,7 @@ ;;; passes them on to CONT. (defun convert-type-check (cont types) (declare (type continuation cont) (type list types)) - (with-ir1-environment (continuation-dest cont) + (with-ir1-environment-from-node (continuation-dest cont) ;; Ensuring that CONT starts a block lets us freely manipulate its uses. (ensure-block-start cont) @@ -359,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-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 @@ -393,7 +400,7 @@ (substitute-continuation new-start victim))) ;; Invoking local call analysis converts this call to a LET. - (local-call-analyze *current-component*)) + (locall-analyze-component *current-component*)) (values)) @@ -402,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)) @@ -416,37 +423,19 @@ (format nil "~:[A possible~;The~] binding of ~S" (and (continuation-use cont) (eq (functional-kind lambda) :let)) - (leaf-name (elt (lambda-vars lambda) pos))))))) + (leaf-source-name (elt (lambda-vars lambda) + pos))))))) (cond ((eq dtype *empty-type*)) ((and (ref-p node) (constant-p (ref-leaf node))) - (compiler-warning "~:[This~;~:*~A~] is not a ~<~%~9T~:;~S:~>~% ~S" - what atype-spec (constant-value (ref-leaf node)))) + (compiler-warn "~:[This~;~:*~A~] is not a ~<~%~9T~:;~S:~>~% ~S" + what atype-spec (constant-value (ref-leaf node)))) (t - (compiler-warning + (compiler-warn "~:[Result~;~:*~A~] is a ~S, ~<~%~9T~:;not a ~S.~>" 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, +;;; 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. @@ -481,16 +470,14 @@ (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)))))) - (when (and (eq type-check t) - (not *byte-compiling*)) + (emit-type-warning use)))))) + (when (eq type-check t) (cond ((probable-type-check-p cont) (conts cont)) (t