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

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

diff --git a/src/compiler/policy.lisp b/src/compiler/policy.lisp
index 47becfd..d3bfe86 100644 (file)
--- a/src/compiler/policy.lisp
+++ b/src/compiler/policy.lisp
@@ -73,8 +73,9 @@
                  (cons name 1))
                *policy-qualities*))
   ;; not actually POLICY, but very similar
-  (setf *handled-conditions* nil))
-  
+  (setf *handled-conditions* nil
+       *disabled-package-locks* nil))
+
 ;;; On the cross-compilation host, we initialize immediately (not
 ;;; waiting for "cold init", since cold init doesn't exist on
 ;;; cross-compilation host).