X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fearly-type.lisp;h=5e21ecffc9df17f44218c50d80f06c0b5428eaf4;hb=28d9bb7a509695caaf78d647b6aa1b0f02c0e83a;hp=2a40aedeb189e280a2e2fa39907c8bab432ec44e;hpb=78a057624fecd10d0fb2ead4ef02ffc361b1ee22;p=sbcl.git diff --git a/src/code/early-type.lisp b/src/code/early-type.lisp index 2a40aed..5e21ecf 100644 --- a/src/code/early-type.lisp +++ b/src/code/early-type.lisp @@ -304,12 +304,7 @@ ;;; type is defined (or redefined). (defun-cached (values-specifier-type :hash-function (lambda (x) - ;; FIXME: The THE FIXNUM stuff is - ;; redundant in SBCL (or modern CMU - ;; CL) because of type inference. - (the fixnum - (logand (the fixnum (sxhash x)) - #x3FF))) + (logand (sxhash x) #x3FF)) :hash-bits 10 :init-wrapper !cold-init-forms) ((orig eq)) @@ -343,7 +338,9 @@ (funcall fun lspec)) ((or (and (consp spec) (symbolp (car spec))) (symbolp spec)) - (when *type-system-initialized* + (when (and *type-system-initialized* + (not (eq (info :type :kind spec) + :forthcoming-defclass-type))) (signal 'parse-unknown-type :specifier spec)) ;; (The RETURN-FROM here inhibits caching.) (return-from values-specifier-type