From: stas <stas@debian.ar7>
Date: Thu, 3 Oct 2013 13:52:46 +0000 (+0400)
Subject: make-values-type-cached: Hardcode values of (sxhash t/nil)).
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=83de338570dd0d867a9a247213ac16f0ab85c123;p=sbcl.git

make-values-type-cached: Hardcode values of (sxhash t/nil)).

To avoid relying on the xc host.
---

diff --git a/src/code/early-type.lisp b/src/code/early-type.lisp
index c5cacb3..a5f8e30 100644
--- a/src/code/early-type.lisp
+++ b/src/code/early-type.lisp
@@ -144,17 +144,20 @@
 
 (defun-cached (make-values-type-cached
                :hash-bits 8
-               :hash-function (lambda (req opt rest allowp)
-                                (logand (logxor
-                                         (type-list-cache-hash req)
-                                         (type-list-cache-hash opt)
-                                         (if rest
-                                             (type-hash-value rest)
-                                             42)
-                                         (if allowp
-                                             #.(logand #xFF (sxhash t))
-                                             #.(logand #xFF (sxhash nil))))
-                                        #xFF)))
+               :hash-function
+               (lambda (req opt rest allowp)
+                 (logand (logxor
+                          (type-list-cache-hash req)
+                          (type-list-cache-hash opt)
+                          (if rest
+                              (type-hash-value rest)
+                              42)
+                          ;; Results (logand #xFF (sxhash t/nil))
+                          ;; hardcoded to avoid relying on the xc host. 
+                          (if allowp
+                              194
+                              11))
+                         #xFF)))
     ((required equal-but-no-car-recursion)
      (optional equal-but-no-car-recursion)
      (rest eq)