X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Ftypetran.lisp;h=b23410cf82f6067460b1d34c351a92c2d4021faa;hb=a18f0a95bc9a457e4d2d00c702b746f29c2662b1;hp=276aa8c4583a022dddf7e8aeeaeee013f34d4ac9;hpb=467a8e5dba8bfa2598ca8e22c1204dc173ce556f;p=sbcl.git diff --git a/src/compiler/typetran.lisp b/src/compiler/typetran.lisp index 276aa8c..b23410c 100644 --- a/src/compiler/typetran.lisp +++ b/src/compiler/typetran.lisp @@ -37,12 +37,10 @@ ;;;; part of the backend; different backends can support different ;;;; sets of predicates. +;;; Establish an association between the type predicate NAME and the +;;; corresponding TYPE. This causes the type predicate to be +;;; recognized for purposes of optimization. (defmacro define-type-predicate (name type) - #!+sb-doc - "Define-Type-Predicate Name Type - Establish an association between the type predicate Name and the - corresponding Type. This causes the type predicate to be recognized for - purposes of optimization." `(%define-type-predicate ',name ',type)) (defun %define-type-predicate (name specifier) (let ((type (specifier-type specifier))) @@ -73,10 +71,10 @@ (defun ir1-transform-type-predicate (object type) (declare (type continuation object) (type ctype type)) (let ((otype (continuation-type object))) - (cond ((not (types-intersect otype type)) - 'nil) + (cond ((not (types-equal-or-intersect otype type)) + nil) ((csubtypep otype type) - 't) + t) (t (give-up-ir1-transform))))) @@ -96,7 +94,7 @@ (continuation-use (basic-combination-fun node)))) *backend-predicate-types*))) - (assert ctype) + (aver ctype) (ir1-transform-type-predicate object ctype))) ;;; If FIND-CLASS is called on a constant class, locate the CLASS-CELL @@ -108,11 +106,15 @@ `(or (class-cell-class ',cell) (error "class not yet defined: ~S" name)))) -;;;; standard type predicates +;;;; standard type predicates, i.e. those defined in package COMMON-LISP, +;;;; plus at least one oddball (%INSTANCEP) +;;;; +;;;; Various other type predicates (e.g. low-level representation +;;;; stuff like SIMPLE-ARRAY-SINGLE-FLOAT-P) are defined elsewhere. -;;; FIXME: needed only at cold load time, can be uninterned afterwards; -;;; or perhaps could just be done at toplevel -(defun define-standard-type-predicates () +;;; FIXME: This function is only called once, at top level. Why not +;;; just expand all its operations into toplevel code? +(defun !define-standard-type-predicates () (define-type-predicate arrayp array) ; (The ATOM predicate is handled separately as (NOT CONS).) (define-type-predicate bit-vector-p bit-vector) @@ -139,8 +141,7 @@ (define-type-predicate funcallable-instance-p funcallable-instance) (define-type-predicate symbolp symbol) (define-type-predicate vectorp vector)) - -(define-standard-type-predicates) +(!define-standard-type-predicates) ;;;; transforms for type predicates not implemented primitively ;;;; @@ -286,21 +287,19 @@ (let* ((types (union-type-types type)) (ltype (specifier-type 'list)) (mtype (find-if #'member-type-p types))) - (cond ((and mtype (csubtypep ltype type)) - (let ((members (member-type-members mtype))) - (once-only ((n-obj object)) - `(if (listp ,n-obj) - t - (typep ,n-obj - '(or ,@(mapcar #'type-specifier - (remove (specifier-type 'cons) - (remove mtype types))) - (member ,@(remove nil members)))))))) - (t - (once-only ((n-obj object)) - `(or ,@(mapcar (lambda (x) - `(typep ,n-obj ',(type-specifier x))) - types))))))) + (if (and mtype (csubtypep ltype type)) + (let ((members (member-type-members mtype))) + (once-only ((n-obj object)) + `(or (listp ,n-obj) + (typep ,n-obj + '(or ,@(mapcar #'type-specifier + (remove (specifier-type 'cons) + (remove mtype types))) + (member ,@(remove nil members))))))) + (once-only ((n-obj object)) + `(or ,@(mapcar (lambda (x) + `(typep ,n-obj ',(type-specifier x))) + types)))))) ;;; Do source transformation for TYPEP of a known intersection type. (defun source-transform-intersection-typep (object type) @@ -399,7 +398,7 @@ ;;; sometimes be generated when byte compiling inline functions, but ;;; it's quite uncommon.) -- WHN 20000523 (deftransform %instance-typep ((object spec) * * :when :both) - (assert (constant-continuation-p spec)) + (aver (constant-continuation-p spec)) (let* ((spec (continuation-value spec)) (class (specifier-type spec)) (name (sb!xc:class-name class)) @@ -408,14 +407,11 @@ (if (and res (not (layout-invalid res))) res nil)))) - (/noshow "entering DEFTRANSFORM %INSTANCE-TYPEP" otype spec class name layout) (cond ;; Flush tests whose result is known at compile time. - ((not (types-intersect otype class)) - (/noshow "flushing constant NIL") + ((not (types-equal-or-intersect otype class)) nil) ((csubtypep otype class) - (/noshow "flushing constant T") t) ;; If not properly named, error. ((not (and name (eq (sb!xc:find-class name) class))) @@ -432,12 +428,10 @@ (values '%instancep '%instance-layout)) (t (values '(lambda (x) (declare (ignore x)) t) 'layout-of))) - (/noshow pred get-layout) (cond ((and (eq (class-state class) :sealed) layout (not (class-subclasses class))) ;; Sealed and has no subclasses. - (/noshow "sealed and has no subclasses") (let ((n-layout (gensym))) `(and (,pred object) (let ((,n-layout (,get-layout object))) @@ -446,7 +440,6 @@ (%layout-invalid-error object ',layout)))) (eq ,n-layout ',layout))))) ((and (typep class 'basic-structure-class) layout) - (/noshow "structure type tests; hierarchical layout depths") ;; structure type tests; hierarchical layout depths (let ((depthoid (layout-depthoid layout)) (n-layout (gensym))) @@ -487,6 +480,12 @@ ;;; simplification. Instance type tests are converted to ;;; %INSTANCE-TYPEP to allow type propagation. (def-source-transform typep (object spec) + ;; KLUDGE: It looks bad to only do this on explicitly quoted forms, + ;; since that would overlook other kinds of constants. But it turns + ;; out that the DEFTRANSFORM for TYPEP detects any constant + ;; continuation, transforms it into a quoted form, and gives this + ;; source transform another chance, so it all works out OK, in a + ;; weird roundabout way. -- WHN 2001-03-18 (if (and (consp spec) (eq (car spec) 'quote)) (let ((type (specifier-type (cadr spec)))) (or (let ((pred (cdr (assoc type *backend-type-predicates*