X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fearly-c.lisp;h=b772aa4c38c534db1408e2ea908a1394849650d5;hb=eda83f00e869193cb69826be5fa1086b95d12ff7;hp=ace5c682dd247d1711343bc9e15f0b3b74cd389e;hpb=318fc08d6f6ce8a5506671bbcae7e91118db8fbc;p=sbcl.git

diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp
index ace5c68..b772aa4 100644
--- a/src/compiler/early-c.lisp
+++ b/src/compiler/early-c.lisp
@@ -22,27 +22,13 @@
   to a function, including &REST args.")
 (def!constant sb!xc:lambda-parameters-limit sb!xc:most-positive-fixnum
   #!+sb-doc
-  "The exclusive upper bound on the number of parameters which may be specifed
+  "The exclusive upper bound on the number of parameters which may be specified
   in a given lambda list. This is actually the limit on required and &OPTIONAL
   parameters. With &KEY and &AUX you can get more.")
 (def!constant sb!xc:multiple-values-limit sb!xc:most-positive-fixnum
   #!+sb-doc
   "The exclusive upper bound on the number of multiple VALUES that you can
   return.")
-
-(defconstant-eqx sb!xc:lambda-list-keywords
-  '(&allow-other-keys
-    &aux
-    &body
-    &environment
-    &key
-    &more
-    &optional
-    &rest
-    &whole)
-  #'equal
-  #!+sb-doc
-  "symbols which are magical in a lambda list")
 
 ;;;; cross-compiler-only versions of CL special variables, so that we
 ;;;; don't have weird interactions with the host compiler
@@ -102,11 +88,12 @@
 (defvar *compiler-style-warning-count*)
 (defvar *compiler-note-count*)
 (defvar *compiler-trace-output*)
-(defvar *constraint-number*)
+(defvar *constraint-universe*)
 (defvar *count-vop-usages*)
 (defvar *current-path*)
 (defvar *current-component*)
 (defvar *delayed-ir1-transforms*)
+(defvar *eval-tlf-index*)
 (defvar *handled-conditions*)
 (defvar *disabled-package-locks*)
 (defvar *policy*)
@@ -118,16 +105,38 @@
 (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*)
+(defvar *lambda-conversions*)
+
+(defvar *stack-allocate-dynamic-extent* t
+  "If true (the default), the compiler respects DYNAMIC-EXTENT declarations
+and stack allocates otherwise inaccessible parts of the object whenever
+possible. Potentially long (over one page in size) vectors are, however, not
+stack allocated except in zero SAFETY code, as such a vector could overflow
+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.
+(defglobal **world-lock** nil)
+(!cold-init-forms
+ (setf **world-lock** (sb!thread:make-mutex :name "World Lock")))
+(!defun-from-collected-cold-init-forms !world-lock-cold-init)
 
-;;; This lock is seized in the compiler, and related areas: the
-;;; compiler is not presently thread-safe
-(defvar *big-compiler-lock*
-  (sb!thread:make-mutex :name "big compiler lock"))
+(defmacro with-world-lock (() &body body)
+  `(sb!thread:with-recursive-lock (**world-lock**)
+     ,@body))
 
 (declaim (type fixnum *compiler-sset-counter*))
 (defvar *compiler-sset-counter* 0)
@@ -177,9 +186,12 @@
     ;; and then we happen to compile bar.lisp before foo.lisp.
   (when (looks-like-name-of-special-var-p symbol)
     ;; FIXME: should be COMPILER-STYLE-WARNING?
-    (style-warn "using the lexical binding of the symbol ~S, not the~@
-dynamic binding, even though the symbol name follows the usual naming~@
-convention (names like *FOO*) for special variables" symbol))
+    (style-warn 'sb!kernel:asterisks-around-lexical-variable-name
+                :format-control
+                "using the lexical binding of the symbol ~
+                 ~/sb-impl::print-symbol-with-prefix/, not the~@
+                 dynamic binding"
+                :format-arguments (list symbol)))
   (values))
 
 (def!struct (debug-name-marker (:make-load-form-fun dump-debug-name-marker)
@@ -191,7 +203,7 @@ convention (names like *FOO*) for special variables" symbol))
 (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*)
@@ -218,7 +230,7 @@ convention (names like *FOO*) for special variables" symbol))
 (setf *debug-name-sharp* (make-debug-name-marker)
       *debug-name-ellipsis* (make-debug-name-marker))
 
-(defun debug-name (type thing)
+(defun debug-name (type thing &optional context)
   (let ((*debug-name-punt* nil))
     (labels ((walk (x)
                (typecase x
@@ -245,7 +257,7 @@ convention (names like *FOO*) for special variables" symbol))
                   x)
                  (t
                   (type-of x)))))
-      (let ((name (list type (walk thing))))
+      (let ((name (list* type (walk thing) (when context (name-context)))))
         (when (legal-fun-name-p name)
           (bug "~S is a legal function name, and cannot be used as a ~
                 debug name." name))