0.8.12.7: Merge package locks, AKA "what can go wrong with a 3783 line patch?"

[sbcl.git] / src / compiler / proclaim.lisp

diff --git a/src/compiler/proclaim.lisp b/src/compiler/proclaim.lisp
index 8c48392..a26b2a4 100644 (file)
--- a/src/compiler/proclaim.lisp
+++ b/src/compiler/proclaim.lisp
@@ -52,6 +52,12 @@
               (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.
@@ -61,6 +67,69 @@
     ;; 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).
@@ -99,6 +168,8 @@
           (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
@@ -107,6 +178,8 @@
             (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)
@@ -123,6 +196,8 @@
             (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)
@@ -158,6 +233,15 @@
                   (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
@@ -172,6 +256,8 @@
           (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)