X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fpolicy.lisp;h=c6b31aad20e4e41b42ef5f7e0ed5c708496446f4;hb=7f579b076a1fc54587538ead07e506e7f06f3fe8;hp=d5fe59d1608c2b8917a0a8fbcca781b1eceb4ea7;hpb=6bdf018a77fd4bbc25c783f330415d444ffaeab2;p=sbcl.git

diff --git a/src/compiler/policy.lisp b/src/compiler/policy.lisp
index d5fe59d..c6b31aa 100644
--- a/src/compiler/policy.lisp
+++ b/src/compiler/policy.lisp
@@ -36,6 +36,8 @@ was MIN instead.
 This is intended to be used interactively, to facilitate recompiling large
 bodies of code with eg. a known minimum safety.
 
+See also :POLICY option in WITH-COMPILATION-UNIT.
+
 EXPERIMENTAL INTERFACE: Subject to change."
   (declare (type policy-quality min))
   (when quality
@@ -73,14 +75,17 @@ EXPERIMENTAL INTERFACE: Subject to change."
       (assq x *policy-dependent-qualities*)))
 
 ;;; Is it deprecated?
-(defun policy-quality-deprecation-warning (quality spec)
-  (when (member quality '(stack-allocate-dynamic-extent stack-allocate-vector
-                          stack-allocate-value-cells))
-    (make-instance 'simple-reference-warning
-                   :format-control "~@<Ignoring deprecated optimization quality ~S in:~_ ~S~:>"
-                   :format-arguments (list quality spec)
-                   :references (list '(:sbcl :variable *stack-allocate-dynamic-extent*)
-                                     '(:sbcl :node "Dynamic-extent allocation")))))
+(defun policy-quality-deprecation-warning (quality)
+  (case quality
+    ((stack-allocate-dynamic-extent stack-allocate-vector stack-allocate-value-cells)
+     (deprecation-warning :late "1.0.19.7" quality '*stack-allocate-dynamic-extent*
+                          :runtime-error nil)
+     t)
+    ((merge-tail-calls)
+     (deprecation-warning :early "1.0.53.74" quality nil :runtime-error nil)
+     t)
+    (otherwise
+     nil)))
 
 ;;; *POLICY* holds the current global compiler policy information, as
 ;;; an alist mapping from optimization quality name to quality value.
@@ -89,6 +94,11 @@ EXPERIMENTAL INTERFACE: Subject to change."
 (declaim (type policy *policy*))
 (defvar *policy*)          ; initialized in cold init
 
+(defun sort-policy (policy)
+  ;; We occasionally want to compare policies using EQL, hence we
+  ;; canonize the order.
+  (sort policy #'string< :key #'car))
+
 ;;; This is to be called early in cold init to set things up, and may
 ;;; also be called again later in cold init in order to reset default
 ;;; optimization policy back to default values after toplevel PROCLAIM
@@ -111,12 +121,12 @@ EXPERIMENTAL INTERFACE: Subject to change."
           ;; Perhaps INHIBIT-NOTES?
           inhibit-warnings))
   (setf *policy*
-        (mapcar (lambda (name)
-                  ;; CMU CL didn't use 1 as the default for
-                  ;; everything, but since ANSI says 1 is the ordinary
-                  ;; value, we do.
-                  (cons name 1))
-                *policy-qualities*))
+        (sort-policy (mapcar (lambda (name)
+                               ;; CMU CL didn't use 1 as the default for
+                               ;; everything, but since ANSI says 1 is the ordinary
+                               ;; value, we do.
+                               (cons name 1))
+                             *policy-qualities*)))
   (setf *policy-restrictions* nil)
   ;; not actually POLICY, but very similar
   (setf *handled-conditions* nil