X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fglobaldb.lisp;h=18c0ebbc50256c1b7c761755192f58c97fb4e02e;hb=e73a30c901ab234291aefc9f1e73507650628892;hp=05bee480996090406bb9a7f0f965da063925c30b;hpb=4c16a9ef1bd70752c2d40d65211ecb76956bbd1d;p=sbcl.git

diff --git a/src/compiler/globaldb.lisp b/src/compiler/globaldb.lisp
index 05bee48..18c0ebb 100644
--- a/src/compiler/globaldb.lisp
+++ b/src/compiler/globaldb.lisp
@@ -32,11 +32,7 @@
 (declaim (special *universal-type*))
 
 ;;; This is sorta semantically equivalent to SXHASH, but optimized for
-;;; legal function names. Note: semantically equivalent does *not*
-;;; mean that it always returns the same value as SXHASH, just that it
-;;; satisfies the formal definition of SXHASH. The ``sorta'' is
-;;; because SYMBOL-HASH will not necessarily return the same value in
-;;; different lisp images.
+;;; legal function names.
 ;;;
 ;;; Why optimize? We want to avoid the fully-general TYPECASE in ordinary
 ;;; SXHASH, because
@@ -58,17 +54,17 @@
 ;;; aren't used too early in cold boot for SXHASH to run).
 #!-sb-fluid (declaim (inline globaldb-sxhashoid))
 (defun globaldb-sxhashoid (x)
-  (cond #-sb-xc-host ; (SYMBOL-HASH doesn't exist on cross-compilation host.)
-	((symbolp x)
-	 (symbol-hash x))
-	#-sb-xc-host ; (SYMBOL-HASH doesn't exist on cross-compilation host.)
+  (cond	((symbolp x) (sxhash x))
 	((and (listp x)
 	      (eq (first x) 'setf)
 	      (let ((rest (rest x)))
 		(and (symbolp (car rest))
 		     (null (cdr rest)))))
-	 (logxor (symbol-hash (second x))
-		 110680597))
+	 ;; We need to declare the type of the value we're feeding to
+	 ;; SXHASH so that the DEFTRANSFORM on symbols kicks in.
+	 (let ((symbol (second x)))
+	   (declare (symbol symbol))
+	   (logxor (sxhash symbol) 110680597)))
 	(t (sxhash x))))
 
 ;;; Given any non-negative integer, return a prime number >= to it.
@@ -263,7 +259,7 @@
 ;;; order in which the TYPE-INFO-creation forms are generated doesn't
 ;;; match the relative order in which the forms need to be executed at
 ;;; cold load time.
-(defparameter *reversed-type-info-init-forms* nil)
+(defparameter *!reversed-type-info-init-forms* nil)
 
 ;;; Define a new type of global information for CLASS. TYPE is the
 ;;; name of the type, DEFAULT is the value for that type when it
@@ -320,7 +316,7 @@
 			 (declare (ignorable name))
 			 ,',default))
 		(setf (type-info-type type-info) ',',type-spec))
-	     *reversed-type-info-init-forms*))
+	     *!reversed-type-info-init-forms*))
      ',type))
 
 ) ; EVAL-WHEN
@@ -1400,7 +1396,7 @@
 ;;; we can set their DEFAULT and TYPE slots.
 (macrolet ((frob ()
 	     `(!cold-init-forms
-		,@(reverse *reversed-type-info-init-forms*))))
+		,@(reverse *!reversed-type-info-init-forms*))))
   (frob))
 
 ;;;; a hack for detecting