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

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

diff --git a/src/compiler/lexenv.lisp b/src/compiler/lexenv.lisp
index f89df35..d9d57f2 100644 (file)
--- a/src/compiler/lexenv.lisp
+++ b/src/compiler/lexenv.lisp
@@ -27,7 +27,7 @@
                           (funs vars blocks tags
                                  type-restrictions
                                 lambda cleanup handled-conditions
-                                policy)))
+                                disabled-package-locks policy)))
   ;; an alist of (NAME . WHAT), where WHAT is either a FUNCTIONAL (a
   ;; local function), a DEFINED-FUN, representing an
   ;; INLINE/NOTINLINE declaration, or a list (MACRO . <function>) (a
@@ -64,6 +64,8 @@
   (cleanup nil)
   ;; condition types we handle with a handler around the compiler
   (handled-conditions *handled-conditions*)
+  ;; lexically disabled package locks (list of symbols)
+  (disabled-package-locks *disabled-package-locks*)
   ;; the current OPTIMIZE policy
   (policy *policy* :type policy))