X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-type.lisp;h=a24de41a49da57c82633b85773b70a1f11ae766f;hb=68c539ab90bb39f342229e68bf9286f63824597a;hp=2db6b49ac779f6adf44b3827ca673c97b740b0bd;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git diff --git a/src/compiler/generic/vm-type.lisp b/src/compiler/generic/vm-type.lisp index 2db6b49..a24de41 100644 --- a/src/compiler/generic/vm-type.lisp +++ b/src/compiler/generic/vm-type.lisp @@ -154,16 +154,19 @@ (when (csubtypep subtype (specifier-type type)) (return type)))) -;;; If Type has a CHECK-xxx template, but doesn't have a corresponding -;;; primitive-type, then return the template's name. Otherwise, return NIL. +;;; If TYPE has a CHECK-xxx template, but doesn't have a corresponding +;;; PRIMITIVE-TYPE, then return the template's name. Otherwise, return NIL. (defun hairy-type-check-template-name (type) (declare (type ctype type)) (typecase type - (named-type - (case (named-type-name type) - (cons 'sb!c:check-cons) - (symbol 'sb!c:check-symbol) - (t nil))) + (cons-type + (if (type= type (specifier-type 'cons)) + 'sb!c:check-cons + nil)) + (built-in-class + (if (type= type (specifier-type 'symbol)) + 'sb!c:check-symbol + nil)) (numeric-type (cond ((type= type (specifier-type 'fixnum)) 'sb!c:check-fixnum)