killing lutexes, adding timeouts

[sbcl.git] / src / compiler / early-c.lisp

diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp
index 7549400..9d19a78 100644 (file)
--- a/src/compiler/early-c.lisp
+++ b/src/compiler/early-c.lisp
@@ -93,6 +93,7 @@
 (defvar *current-path*)
 (defvar *current-component*)
 (defvar *delayed-ir1-transforms*)
+(defvar *eval-tlf-index*)
 (defvar *handled-conditions*)
 (defvar *disabled-package-locks*)
 (defvar *policy*)
@@ -104,9 +105,15 @@
 (defvar *fixup-notes*)
 (defvar *in-pack*)
 (defvar *info-environment*)
+#!+inline-constants
+(progn
+  (defvar *constant-segment*)
+  (defvar *constant-table*)
+  (defvar *constant-vector*))
 (defvar *lexenv*)
 (defvar *source-info*)
 (defvar *source-plist*)
+(defvar *source-namestring*)
 (defvar *trace-table*)
 (defvar *undefined-warnings*)
 (defvar *warnings-p*)
@@ -122,13 +129,13 @@ the stack without triggering overflow protection.")
 (!begin-collecting-cold-init-forms)
 ;;; This lock is seized in the compiler, and related areas -- like the
 ;;; classoid/layout/class system.
-(defvar *world-lock*)
+(defglobal **world-lock** nil)
 (!cold-init-forms
- (setf *world-lock* (sb!thread:make-mutex :name "World Lock")))
+ (setf **world-lock** (sb!thread:make-mutex :name "World Lock")))
 (!defun-from-collected-cold-init-forms !world-lock-cold-init)
 
 (defmacro with-world-lock (() &body body)
-  `(sb!thread:with-recursive-lock (*world-lock*)
+  `(sb!thread:with-recursive-lock (**world-lock**)
      ,@body))
 
 (declaim (type fixnum *compiler-sset-counter*))
@@ -181,7 +188,8 @@ the stack without triggering overflow protection.")
     ;; FIXME: should be COMPILER-STYLE-WARNING?
     (style-warn 'sb!kernel:asterisks-around-lexical-variable-name
                 :format-control
-                "using the lexical binding of the symbol ~S, not the~@
+                "using the lexical binding of the symbol ~
+                 ~/sb-impl::print-symbol-with-prefix/, not the~@
                  dynamic binding"
                 :format-arguments (list symbol)))
   (values))