X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fearly-c.lisp;h=21f89b5f4ff442978670d027798847a1b55be494;hb=49e8403800426f37a54d9b87353a31af36e7af40;hp=877d2c8fc8eb61cfd4b27c0d2cd94886aff1e572;hpb=95f17ca63742f8c164309716b35bc25545a849a6;p=sbcl.git diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp index 877d2c8..21f89b5 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*)) @@ -194,7 +200,7 @@ the stack without triggering overflow protection.") (defvar *debug-name-sharp*) (defvar *debug-name-ellipsis*) -(eval-when (:compile-toplevel :load-toplevel :execute) +(eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute) (defun dump-debug-name-marker (marker &optional env) (declare (ignore env)) (cond ((eq marker *debug-name-sharp*)