0.pre7.129:

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

diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp
index 430918b..acf0085 100644 (file)
--- a/src/compiler/early-c.lisp
+++ b/src/compiler/early-c.lisp
@@ -30,11 +30,18 @@
   "The exclusive upper bound on the number of multiple VALUES that you can
   return.")
 
-;;; FIXME: Shouldn't SB!C::&MORE be in this list?
 (defconstant-eqx sb!xc:lambda-list-keywords
-  '(&optional &rest &key &aux &body &whole &allow-other-keys &environment)
-  #!+sb-doc
+  '(&allow-other-keys
+    &aux
+    &body
+    &environment
+    &key
+    &more
+    &optional
+    &rest
+    &whole)
   #'equal
+  #!+sb-doc
   "symbols which are magical in a lambda list")
 \f
 ;;;; cross-compiler-only versions of CL special variables, so that we
@@ -67,11 +74,11 @@
 (declaim (type lexenv *lexenv*))
 
 ;;; *FREE-VARIABLES* translates from the names of variables referenced
-;;; globally to the LEAF structures for them. *FREE-FUNCTIONS* is like
+;;; globally to the LEAF structures for them. *FREE-FUNS* is like
 ;;; *FREE-VARIABLES*, only it deals with function names.
 (defvar *free-variables*)
-(defvar *free-functions*)
-(declaim (type hash-table *free-variables* *free-functions*))
+(defvar *free-funs*)
+(declaim (type hash-table *free-variables* *free-funs*))
 
 ;;; We use the same CONSTANT structure to represent all equal anonymous
 ;;; constants. This hashtable translates from constants to the LEAFs that
@@ -108,6 +115,18 @@
 (defvar *trace-table*)
 (defvar *undefined-warnings*)
 (defvar *warnings-p*)
+
+;;; unique ID for the next object created (to let us track object
+;;; identity even across GC, useful for understanding weird compiler
+;;; bugs where something is supposed to be unique but is instead
+;;; exists as duplicate objects)
+#!+sb-show
+(progn
+  (defvar *object-id-counter* 0)
+  (defun new-object-id ()
+    (prog1
+       *object-id-counter*
+      (incf *object-id-counter*))))
 \f
 ;;;; miscellaneous utilities
 
@@ -118,7 +137,7 @@
                note-name-defined))
 (defun note-name-defined (name kind)
   ;; We do this BOUNDP check because this function can be called when
-  ;; not in a compilation unit (as when loading top-level forms).
+  ;; not in a compilation unit (as when loading top level forms).
   (when (boundp '*undefined-warnings*)
     (setq *undefined-warnings*
          (delete-if (lambda (x)