X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1tran.lisp;h=579e41df75f0ea64f25341b3b699f1bf05ea6566;hb=422b88abf96f4842a3d0999cd3b80d96f5a153d6;hp=74832d6a943c06894f54b858d33679ecad878255;hpb=816248ab4fe04775879a7e5a5ce1b4c613afe9d5;p=sbcl.git

diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp
index 74832d6..579e41d 100644
--- a/src/compiler/ir1tran.lisp
+++ b/src/compiler/ir1tran.lisp
@@ -124,9 +124,8 @@
 ;;; names a macro or special form, then we error out using the
 ;;; supplied context which indicates what we were trying to do that
 ;;; demanded a function.
+(declaim (ftype (function (t string) global-var) find-free-fun))
 (defun find-free-fun (name context)
-  (declare (string context))
-  (declare (values global-var))
   (or (let ((old-free-fun (gethash name *free-funs*)))
 	(and (not (invalid-free-fun-p old-free-fun))
 	     old-free-fun))
@@ -171,8 +170,8 @@
 ;;; corresponding value. Otherwise, we make a new leaf using
 ;;; information from the global environment and enter it in
 ;;; *FREE-VARS*. If the variable is unknown, then we emit a warning.
+(declaim (ftype (function (t) (or leaf cons heap-alien-info)) find-free-var))
 (defun find-free-var (name)
-  (declare (values (or leaf heap-alien-info)))
   (unless (symbolp name)
     (compiler-error "Variable name is not a symbol: ~S." name))
   (or (gethash name *free-vars*)
@@ -185,6 +184,15 @@
 	      (case kind
 		(:alien
 		 (info :variable :alien-info name))
+                ;; FIXME: The return value in this case should really be
+                ;; of type SB!C::LEAF.  I don't feel too badly about it,
+                ;; because the MACRO idiom is scattered throughout this
+                ;; file, but it should be cleaned up so we're not
+                ;; throwing random conses around.  --njf 2002-03-23
+                (:macro
+                 (let ((expansion (info :variable :macro-expansion name))
+                       (type (type-specifier (info :variable :type name))))
+                   `(MACRO . (the ,type ,expansion))))
 		(:constant
 		 (let ((value (info :variable :constant-value name)))
 		   (make-constant :value value
@@ -204,7 +212,7 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   ;; The EVAL-WHEN is necessary for #.(1+ LIST-TO-HASH-TABLE-THRESHOLD) 
   ;; below. -- AL 20010227
-  (defconstant list-to-hash-table-threshold 32))
+  (def!constant list-to-hash-table-threshold 32))
 (defun maybe-emit-make-load-forms (constant)
   (let ((things-processed nil)
 	(count 0))
@@ -1046,7 +1054,7 @@
 	)
        ((functional-p var)
 	(setf (leaf-ever-used var) t))
-       ((lambda-var-specvar var)
+       ((and (lambda-var-specvar var) (eq (first spec) 'ignore))
 	;; ANSI's definition for "Declaration IGNORE, IGNORABLE"
 	;; requires that this be a STYLE-WARNING, not a full WARNING.
 	(compiler-style-warn "declaring special variable ~S to be ignored"
@@ -1178,7 +1186,6 @@
 			      :where-from (leaf-where-from specvar)
 			      :specvar specvar)))
 	  (t
-	   (note-lexical-binding name)
 	   (make-lambda-var :%source-name name)))))
 
 ;;; Make the default keyword for a &KEY arg, checking that the keyword
@@ -1463,25 +1470,7 @@
 	  (continuation-starts-block cont1)
 	  (link-node-to-previous-continuation bind cont1)
 	  (use-continuation bind cont2)
-	  (ir1-convert-special-bindings cont2 result
-					(if (policy bind
-						    (or (> safety
-							   (max speed space))
-							(= safety 3)))
-					    ;; (Stuffing this in at IR1 level
-					    ;; like this is pretty crude. And
-					    ;; it's particularly inefficient
-					    ;; to execute it on *every* LAMBDA,
-					    ;; including LET-converted LAMBDAs.
-					    ;; But when SAFETY is high, it's
-					    ;; still arguably an improvement
-					    ;; over the old CMU CL approach of
-					    ;; doing nothing (proactively
-					    ;; waiting for evolution to breed
-					    ;; stronger programmers:-). -- WHN)
-					    `((%detect-stack-exhaustion)
-					      ,@body)
-					    body)
+	  (ir1-convert-special-bindings cont2 result body
 					aux-vars aux-vals (svars)))
 
 	(let ((block (continuation-block result)))
@@ -2076,8 +2065,8 @@
       (setf (functional-inlinep fun) (defined-fun-inlinep var))
       (assert-new-definition var fun)
       (setf (defined-fun-inline-expansion var) var-expansion)
-      ;; If definitely not an interpreter stub, then substitute for any
-      ;; old references.
+      ;; If definitely not an interpreter stub, then substitute for
+      ;; any old references.
       (unless (or (eq (defined-fun-inlinep var) :notinline)
 		  (not *block-compile*)
 		  (and fun-info