0.8.6.14:

[sbcl.git] / src / compiler / generic / early-type-vops.lisp

diff --git a/src/compiler/generic/early-type-vops.lisp b/src/compiler/generic/early-type-vops.lisp
index 8b4d96c..06d21b3 100644 (file)
--- a/src/compiler/generic/early-type-vops.lisp
+++ b/src/compiler/generic/early-type-vops.lisp
@@ -16,7 +16,6 @@
 (defparameter *fun-header-widetags*
   (list funcallable-instance-header-widetag
        simple-fun-header-widetag
-       closure-fun-header-widetag
        closure-header-widetag))
 
 (defun canonicalize-headers (headers)
@@ -91,13 +90,9 @@
       (lowtags
        (when (cdr lowtags)
         (error "can't test multiple lowtags at the same time"))
-       (if headers
-          `(%test-lowtag-and-headers
-            ,value ,target ,not-p ,(car lowtags)
-            ,function-p ',(canonicalize-headers headers)
-            ,@other-args)
-          `(%test-lowtag ,value ,target ,not-p ,(car lowtags)
-            ,@other-args)))
+       (when headers
+        (error "can't test non-fixnum lowtags and headers at the same time"))
+       `(%test-lowtag ,value ,target ,not-p ,(car lowtags) ,@other-args))
       (headers
        `(%test-headers ,value ,target ,not-p ,function-p
         ',(canonicalize-headers headers)