(compiler-warn "ignoring bad optimization value ~S in ~S"
raw-value spec))
(t
+ ;; we can't do this yet, because CLOS macros expand
+ ;; into code containing INHIBIT-WARNINGS.
+ #+nil
+ (when (eql quality 'sb!ext:inhibit-warnings)
+ (compiler-style-warn "~S is deprecated: use ~S instead"
+ quality 'sb!ext:muffle-conditions))
(push (cons quality raw-value)
result)))))
;; Add any nonredundant entries from old POLICY.
;; Voila.
result))
+(declaim (ftype (function (list list) list)
+ process-handle-conditions-decl))
+(defun process-handle-conditions-decl (spec list)
+ (let ((new (copy-alist list)))
+ (dolist (clause (cdr spec))
+ (destructuring-bind (typespec restart-name) clause
+ (let ((ospec (rassoc restart-name new :test #'eq)))
+ (if ospec
+ (setf (car ospec)
+ (type-specifier
+ (type-union (specifier-type (car ospec))
+ (specifier-type typespec))))
+ (push (cons (type-specifier (specifier-type typespec))
+ restart-name)
+ new)))))
+ new))
+(declaim (ftype (function (list list) list)
+ process-muffle-conditions-decl))
+(defun process-muffle-conditions-decl (spec list)
+ (process-handle-conditions-decl
+ (cons 'handle-conditions
+ (mapcar (lambda (x) (list x 'muffle-warning)) (cdr spec)))
+ list))
+
+(declaim (ftype (function (list list) list)
+ process-unhandle-conditions-decl))
+(defun process-unhandle-conditions-decl (spec list)
+ (let ((new (copy-alist list)))
+ (dolist (clause (cdr spec))
+ (destructuring-bind (typespec restart-name) clause
+ (let ((ospec (rassoc restart-name new :test #'eq)))
+ (if ospec
+ (let ((type-specifier
+ (type-specifier
+ (type-intersection
+ (specifier-type (car ospec))
+ (specifier-type `(not ,typespec))))))
+ (if type-specifier
+ (setf (car ospec) type-specifier)
+ (setq new
+ (delete restart-name new :test #'eq :key #'cdr))))
+ ;; do nothing?
+ nil))))
+ new))
+(declaim (ftype (function (list list) list)
+ process-unmuffle-conditions-decl))
+(defun process-unmuffle-conditions-decl (spec list)
+ (process-unhandle-conditions-decl
+ (cons 'unhandle-conditions
+ (mapcar (lambda (x) (list x 'muffle-warning)) (cdr spec)))
+ list))
+
+(declaim (ftype (function (list list) list)
+ process-package-lock-decl))
+(defun process-package-lock-decl (spec old)
+ (let ((decl (car spec))
+ (list (cdr spec)))
+ (ecase decl
+ (disable-package-locks
+ (union old list :test #'equal))
+ (enable-package-locks
+ (set-difference old list :test #'equal)))))
+
;;; 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).
(t
decl-spec)))))
+(defvar *queued-proclaims*) ; initialized in !COLD-INIT-FORMS
+
+(!begin-collecting-cold-init-forms)
+(!cold-init-forms (setf *queued-proclaims* nil))
+(!defun-from-collected-cold-init-forms !early-proclaim-cold-init)
+
(defun sb!xc:proclaim (raw-form)
#+sb-xc (/show0 "entering PROCLAIM, RAW-FORM=..")
#+sb-xc (/hexstr raw-form)
(error "can't declare a non-symbol as SPECIAL: ~S" name))
(when (constantp name)
(error "can't declare a constant as SPECIAL: ~S" name))
+ (with-single-package-locked-error
+ (:symbol name "globally declaraing ~A special"))
(clear-info :variable :constant-value name)
(setf (info :variable :kind name) :special)))
(type
- (when *type-system-initialized*
- (let ((type (specifier-type (first args))))
- (dolist (name (rest args))
- (unless (symbolp name)
- (error "can't declare TYPE of a non-symbol: ~S" name))
- (when (eq (info :variable :where-from name) :declared)
- (let ((old-type (info :variable :type name)))
- (when (type/= type old-type)
- (style-warn "The new TYPE proclamation~% ~S~@
- for ~S does not match the old TYPE~@
- proclamation ~S"
- type name old-type))))
- (setf (info :variable :type name) type)
- (setf (info :variable :where-from name) :declared)))))
+ (if *type-system-initialized*
+ (let ((type (specifier-type (first args))))
+ (dolist (name (rest args))
+ (unless (symbolp name)
+ (error "can't declare TYPE of a non-symbol: ~S" name))
+ (with-single-package-locked-error
+ (:symbol name "globally declaring the type of ~A"))
+ (when (eq (info :variable :where-from name) :declared)
+ (let ((old-type (info :variable :type name)))
+ (when (type/= type old-type)
+ (style-warn "The new TYPE proclamation~% ~S~@
+ for ~S does not match the old TYPE~@
+ proclamation ~S"
+ type name old-type))))
+ (setf (info :variable :type name) type)
+ (setf (info :variable :where-from name) :declared)))
+ (push raw-form *queued-proclaims*)))
(ftype
- ;; FIXME: Since currently *TYPE-SYSTEM-INITIALIZED* is not set
- ;; until many toplevel forms have run, this condition on
- ;; PROCLAIM (FTYPE ..) (and on PROCLAIM (TYPE ..), above) means
- ;; that valid PROCLAIMs in cold code could get lost. Probably
- ;; the cleanest way to deal with this would be to initialize
- ;; the type system completely in special cold init forms,
- ;; before any ordinary toplevel forms run. Failing that, we
- ;; could queue up PROCLAIMs to be done after the type system is
- ;; initialized. Failing that, we could at least issue a warning
- ;; when we have to ignore a PROCLAIM because the type system is
- ;; uninitialized.
- (when *type-system-initialized*
- (let ((ctype (specifier-type (first args))))
- (unless (csubtypep ctype (specifier-type 'function))
- (error "not a function type: ~S" (first args)))
- (dolist (name (rest args))
-
- ;; 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/= ctype old-type)
- (style-warn
- "new FTYPE proclamation~@
- ~S~@
- for ~S does not match old FTYPE proclamation~@
- ~S"
- (list ctype name old-type)))))
- |#
+ (if *type-system-initialized*
+ (let ((ctype (specifier-type (first args))))
+ (unless (csubtypep ctype (specifier-type 'function))
+ (error "not a function type: ~S" (first args)))
+ (dolist (name (rest args))
+ (with-single-package-locked-error
+ (:symbol name "globally declaring the ftype of ~A"))
+ (when (eq (info :function :where-from name) :declared)
+ (let ((old-type (info :function :type name)))
+ (when (type/= ctype old-type)
+ (style-warn
+ "new FTYPE proclamation~@
+ ~S~@
+ for ~S does not match old FTYPE proclamation~@
+ ~S"
+ ctype 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.
- ;;
- ;; Other consequences of we-know-you're-a-function-now
- ;; are appropriate too, e.g. any MACRO-FUNCTION goes away.
- (proclaim-as-fun-name name)
- (note-name-defined name :function)
+ ;; 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.
+ ;;
+ ;; Other consequences of we-know-you're-a-function-now
+ ;; are appropriate too, e.g. any MACRO-FUNCTION goes away.
+ (proclaim-as-fun-name name)
+ (note-name-defined name :function)
- ;; the actual type declaration
- (setf (info :function :type name) ctype
- (info :function :where-from name) :declared)))))
+ ;; the actual type declaration
+ (setf (info :function :type name) ctype
+ (info :function :where-from name) :declared)))
+ (push raw-form *queued-proclaims*)))
(freeze-type
(dolist (type args)
(let ((class (specifier-type type)))
- (when (typep class 'sb!xc:class)
- (setf (class-state class) :sealed)
- (let ((subclasses (class-subclasses class)))
+ (when (typep class 'classoid)
+ (setf (classoid-state class) :sealed)
+ (let ((subclasses (classoid-subclasses class)))
(when subclasses
(dohash (subclass layout subclasses)
(declare (ignore layout))
- (setf (class-state subclass) :sealed))))))))
+ (setf (classoid-state subclass) :sealed))))))))
(optimize
(setq *policy* (process-optimize-decl form *policy*)))
+ (muffle-conditions
+ (setq *handled-conditions*
+ (process-muffle-conditions-decl form *handled-conditions*)))
+ (unmuffle-conditions
+ (setq *handled-conditions*
+ (process-unmuffle-conditions-decl form *handled-conditions*)))
+ ((disable-package-locks enable-package-locks)
+ (setq *disabled-package-locks*
+ (process-package-lock-decl form *disabled-package-locks*)))
((inline notinline maybe-inline)
(dolist (name args)
(proclaim-as-fun-name name) ; since implicitly it is a function
(error "In~% ~S~%the declaration to be recognized is not a ~
symbol:~% ~S"
form decl))
+ (with-single-package-locked-error
+ (:symbol decl "globally declaring ~A as a declaration proclamation"))
(setf (info :declaration :recognized decl) t)))
(t
(unless (info :declaration :recognized kind)
projects / sbcl.git / blobdiff