X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fproclaim.lisp;h=8c48392b369be83bb4ccca255bd1f8c5739c4cc1;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=89af8fba01017c6687bcc6c5ae1ac0799234cf35;hpb=c5df202d52732a0dea8dc3558954a729073b7970;p=sbcl.git

diff --git a/src/compiler/proclaim.lisp b/src/compiler/proclaim.lisp
index 89af8fb..8c48392 100644
--- a/src/compiler/proclaim.lisp
+++ b/src/compiler/proclaim.lisp
@@ -80,8 +80,10 @@
 	    (t
 	     decl-spec)))))
 
+(defvar *queued-proclaims*) ; initialized in !COLD-INIT-FORMS
+
 (!begin-collecting-cold-init-forms)
-(!cold-init-forms (defvar *queued-proclaims* nil))
+(!cold-init-forms (setf *queued-proclaims* nil))
 (!defun-from-collected-cold-init-forms !early-proclaim-cold-init)
 
 (defun sb!xc:proclaim (raw-form)
@@ -121,33 +123,19 @@
 	     (unless (csubtypep ctype (specifier-type 'function))
 	       (error "not a function type: ~S" (first args)))
 	     (dolist (name (rest args))
-	       
-	       ;; KLUDGE: Something like the commented-out TYPE/=
-	       ;; check here would be nice, but it has been
-	       ;; commented out because TYPE/= doesn't support
-	       ;; function types. It could probably be made to do
-	       ;; so, but it might take some time, since function
-	       ;; types involve values types, which aren't
-	       ;; supported, and since the SUBTYPEP operator for
-	       ;; FUNCTION types is rather broken, e.g.
-	       ;;   (SUBTYPEP '(FUNCTION (T BOOLEAN) NIL)
-	       ;;             '(FUNCTION (FIXNUM FIXNUM) NIL)) => T, T
-	       ;; -- WHN 20000229
-	       #|
-	     (when (eq (info :function :where-from name) :declared)
-	       (let ((old-type (info :function :type name)))
-		 (when (type/= ctype old-type)
-		   (style-warn
-		    "new FTYPE proclamation~@
-                     ~S~@
-                     for ~S does not match old FTYPE proclamation~@
-                     ~S"
-		    (list ctype name old-type)))))
-	       |#
+               (when (eq (info :function :where-from name) :declared)
+                 (let ((old-type (info :function :type name)))
+                   (when (type/= ctype old-type)
+                     (style-warn
+                      "new FTYPE proclamation~@
+                       ~S~@
+                       for ~S does not match old FTYPE proclamation~@
+                       ~S"
+                      ctype name old-type))))
 
 	       ;; Now references to this function shouldn't be warned
 	       ;; about as undefined, since even if we haven't seen a
-	       ;; definition yet, we know one is planned. 
+	       ;; definition yet, we know one is planned.
 	       ;;
 	       ;; Other consequences of we-know-you're-a-function-now
 	       ;; are appropriate too, e.g. any MACRO-FUNCTION goes away.