Let OFFSET-CONFLICTS-IN-SB check multiple offsets at a time

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

diff --git a/src/compiler/policies.lisp b/src/compiler/policies.lisp
index 53b21e4..7e3aaaf 100644 (file)
--- a/src/compiler/policies.lisp
+++ b/src/compiler/policies.lisp
@@ -45,12 +45,6 @@ Enabling this option can increase heap consing of closures.")
   ("off" "maybe" "on" "on")
   "Control inline-substitution of used-once local functions.")
 
-(define-optimization-quality rest-conversion
-    (if (= debug 3) 0 3)
-  ("off" "maybe" "on" "on")
-  "Control conversion of &REST argments to &MORE arguments when
-only used as the final argument to APPLY.")
-
 (define-optimization-quality alien-funcall-saves-fp-and-pc
     (if (<= speed debug) 3 0)
   ("no" "maybe" "yes" "yes")
@@ -61,10 +55,6 @@ more reliable bactracing across foreign calls.")
     (if (zerop safety) 0 3)
   ("no" "maybe" "yes" "yes"))
 
-(define-optimization-quality merge-tail-calls
-    3
-  "Deprecated: has no effect on compiled code. (Never really did.)")
-
 (define-optimization-quality insert-debug-catch
     (if (> debug (max speed space))
         3
@@ -139,3 +129,16 @@ debugger.")
 (define-optimization-quality store-coverage-data
     0
   ("no" "no" "yes" "yes"))
+
+#!+sb-safepoint
+(define-optimization-quality inhibit-safepoints
+    0
+  ("no" "no" "yes" "yes")
+  "When disabled, the compiler will insert safepoints at strategic
+points (loop edges, function prologues) to ensure that potentially
+long-running code can be interrupted.
+
+When enabled, no safepoints will be inserted explicitly.  Note that
+this declaration does not prevent out-of-line function calls, which
+will encounter safepoints unless the target function has also been
+compiled with this declaration in effect.")