X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fearly-c.lisp;h=bb883b4367048d27df8addc4de80df6fd4bef456;hb=7448b6225fa43ea6a61391990b173c09505ba45d;hp=05fe74488157c93f998e4f037d782d5720d68252;hpb=da5a7ccd58c2bf3c5287a11fb41e01403e5745e8;p=sbcl.git diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp index 05fe744..bb883b4 100644 --- a/src/compiler/early-c.lisp +++ b/src/compiler/early-c.lisp @@ -104,8 +104,14 @@ (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 *trace-table*) (defvar *undefined-warnings*) (defvar *warnings-p*) @@ -121,13 +127,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*)) @@ -180,7 +186,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))