X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fproclaim.lisp;h=0a6e7e385232a8d8701cc5b94022b5e7a884a4c4;hb=0a82f2db352cc348d2107a882e50af222ff97ed3;hp=8545d009e1920a947c5d5810e3f6677b44b3f1dc;hpb=2abf77f6c4c559a3e5b7fc351a4743305381feb6;p=sbcl.git diff --git a/src/compiler/proclaim.lisp b/src/compiler/proclaim.lisp index 8545d00..0a6e7e3 100644 --- a/src/compiler/proclaim.lisp +++ b/src/compiler/proclaim.lisp @@ -19,41 +19,6 @@ (defvar *undefined-warnings*) (declaim (list *undefined-warnings*)) -;;; Check that NAME is a valid function name, returning the name if -;;; OK, and doing an error if not. In addition to checking for basic -;;; well-formedness, we also check that symbol names are not NIL or -;;; the name of a special form. -(defun check-function-name (name) - (typecase name - (list - (unless (and (consp name) (consp (cdr name)) - (null (cddr name)) (eq (car name) 'setf) - (symbolp (cadr name))) - (compiler-error "illegal function name: ~S" name)) - name) - (symbol - (when (eq (info :function :kind name) :special-form) - (compiler-error "Special form is an illegal function name: ~S" name)) - name) - (t - (compiler-error "illegal function name: ~S" name)))) - -;;; This is called to do something about SETF functions that overlap -;;; with SETF macros. Perhaps we should interact with the user to see -;;; whether the macro should be blown away, but for now just give a -;;; warning. Due to the weak semantics of the (SETF FUNCTION) name, we -;;; can't assume that they aren't just naming a function (SETF FOO) -;;; for the heck of it. NAME is already known to be well-formed. -(defun note-if-setf-function-and-macro (name) - (when (consp name) - (when (or (info :setf :inverse name) - (info :setf :expander name)) - (compiler-style-warning - "defining as a SETF function a name that already has a SETF macro:~ - ~% ~S" - name))) - (values)) - ;;; Look up some symbols in *FREE-VARIABLES*, returning the var ;;; structures for any which exist. If any of the names aren't ;;; symbols, we complain. @@ -69,9 +34,10 @@ ;;; Return a new POLICY containing the policy information represented ;;; by the optimize declaration SPEC. Any parameters not specified are ;;; defaulted from the POLICY argument. -(declaim (ftype (function (list policy) policy) process-optimize-declaration)) -(defun process-optimize-declaration (spec policy) - (let ((result policy)) ; may have new entries pushed on it below +(declaim (ftype (function (list policy) policy) process-optimize-decl)) +(defun process-optimize-decl (spec policy) + (let ((result nil)) + ;; Add new entries from SPEC. (dolist (q-and-v-or-just-q (cdr spec)) (multiple-value-bind (quality raw-value) (if (atom q-and-v-or-just-q) @@ -88,13 +54,36 @@ (t (push (cons quality (rational raw-value)) result))))) + ;; Add any nonredundant entries from old POLICY. + (dolist (old-entry policy) + (unless (assq (car old-entry) result) + (push old-entry result))) + ;; Voila. result)) -(defun sb!xc:proclaim (form) - (unless (consp form) - (error "malformed PROCLAIM spec: ~S" form)) - (let ((kind (first form)) - (args (rest form))) +;;; ANSI defines the declaration (FOO X Y) to be equivalent to +;;; (TYPE FOO X Y) when FOO is a type specifier. This function +;;; implements that by converting (FOO X Y) to (TYPE FOO X Y). +(defun canonized-decl-spec (decl-spec) + (let ((id (first decl-spec))) + (unless (symbolp id) + (error "The declaration identifier is not a symbol: ~S" id)) + (let ((id-is-type (info :type :kind id)) + (id-is-declared-decl (info :declaration :recognized id))) + (cond ((and id-is-type id-is-declared-decl) + (compiler-error + "ambiguous declaration ~S:~% ~ + ~S was declared as a DECLARATION, but is also a type name." + decl-spec id)) + (id-is-type + (cons 'type decl-spec)) + (t + decl-spec))))) + +(defun sb!xc:proclaim (raw-form) + (let* ((form (canonized-decl-spec raw-form)) + (kind (first form)) + (args (rest form))) (case kind (special (dolist (name args) @@ -136,56 +125,46 @@ (unless (csubtypep type (specifier-type 'function)) (error "not a function type: ~S" (first args))) (dolist (name (rest args)) - (cond ((info :function :accessor-for name) - ;; FIXME: This used to be a WARNING, which was - ;; clearly wrong, since it would cause warnings to - ;; be issued for conforming code, which is really - ;; annoying for people who use Lisp code to build - ;; Lisp systems (and check the return values from - ;; COMPILE and COMPILE-FILE). Changing it to a - ;; compiler note is somewhat better, since it's - ;; after all news about a limitation of the - ;; compiler, not a problem in the code. But even - ;; better would be to handle FTYPE proclamations - ;; for slot accessors, and since in the long run - ;; slot accessors should become more like other - ;; functions, this should eventually become - ;; straightforward. - (maybe-compiler-note - "~@" - name)) - (t - ;; KLUDGE: Something like the commented-out TYPE/= - ;; check here would be nice, but it has been - ;; commented out because TYPE/= doesn't support - ;; function types. It could probably be made to do - ;; so, but it might take some time, since function - ;; types involve values types, which aren't - ;; supported, and since the SUBTYPEP operator for - ;; FUNCTION types is rather broken, e.g. - ;; (SUBTYPEP '(FUNCTION (T BOOLEAN) NIL) - ;; '(FUNCTION (FIXNUM FIXNUM) NIL)) => T, T - ;; -- WHN 20000229 - #+nil - (when (eq (info :function :where-from name) :declared) - (let ((old-type (info :function :type name))) - (when (type/= type old-type) - (style-warn "new FTYPE proclamation~@ - ~S~@ - for ~S does not match old FTYPE proclamation~@ - ~S" - (list type name old-type))))) + ;; KLUDGE: Something like the commented-out TYPE/= + ;; check here would be nice, but it has been + ;; commented out because TYPE/= doesn't support + ;; function types. It could probably be made to do + ;; so, but it might take some time, since function + ;; types involve values types, which aren't + ;; supported, and since the SUBTYPEP operator for + ;; FUNCTION types is rather broken, e.g. + ;; (SUBTYPEP '(FUNCTION (T BOOLEAN) NIL) + ;; '(FUNCTION (FIXNUM FIXNUM) NIL)) => T, T + ;; -- WHN 20000229 + #| + (when (eq (info :function :where-from name) :declared) + (let ((old-type (info :function :type name))) + (when (type/= type old-type) + (style-warn + "new FTYPE proclamation~@ + ~S~@ + for ~S does not match old FTYPE proclamation~@ + ~S" + (list type name old-type))))) + |# + + ;; Now references to this function shouldn't be warned + ;; about as undefined, since even if we haven't seen a + ;; definition yet, we know one is planned. (But if this + ;; function name was already declared as a structure + ;; accessor, then that was already been taken care of.) + (unless (info :function :accessor-for name) + (proclaim-as-fun-name name) + (note-name-defined name :function)) - (proclaim-as-function-name name) - (note-name-defined name :function) - (setf (info :function :type name) type - (info :function :where-from name) :declared))))))) + ;; the actual type declaration + (setf (info :function :type name) type + (info :function :where-from name) :declared))))) (freeze-type (dolist (type args) (let ((class (specifier-type type))) - (when (typep class 'class) + (when (typep class 'sb!xc:class) (setf (class-state class) :sealed) (let ((subclasses (class-subclasses class))) (when subclasses @@ -193,34 +172,25 @@ (declare (ignore layout)) (setf (class-state subclass) :sealed)))))))) (optimize - (setq *default-policy* - (process-optimize-declaration form *default-policy*))) - (optimize-interface - (setq *default-interface-policy* - (process-optimize-declaration form *default-interface-policy*))) + (setq *policy* (process-optimize-decl form *policy*))) ((inline notinline maybe-inline) (dolist (name args) - (proclaim-as-function-name name) + ;; (CMU CL did (PROCLAIM-AS-FUN-NAME NAME) here, but that + ;; seems more likely to surprise the user than to help him, so + ;; we don't do it.) (setf (info :function :inlinep name) - (case kind + (ecase kind (inline :inline) (notinline :notinline) (maybe-inline :maybe-inline))))) - (constant-function - (let ((info (make-function-info - :attributes (ir1-attributes movable foldable flushable - unsafe)))) - (dolist (name args) - (proclaim-as-function-name name) - (setf (info :function :info name) info)))) (declaration (dolist (decl args) (unless (symbolp decl) - (error "The declaration to be recognized is not a symbol: ~S" decl)) + (error "In~% ~S~%the declaration to be recognized is not a ~ + symbol:~% ~S" + form decl)) (setf (info :declaration :recognized decl) t))) (t - (cond ((member kind *standard-type-names*) - (sb!xc:proclaim `(type ,@form))) ; FIXME: ,@ instead of . , - ((not (info :declaration :recognized kind)) - (warn "unrecognized proclamation: ~S" form)))))) + (unless (info :declaration :recognized kind) + (compiler-warning "unrecognized declaration ~S" raw-form))))) (values))