X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftypetran.lisp;h=612d2bcc199e1e95e52d32c141e19da67a240122;hb=94ea2b2082deaa0331dfb66fa6af6ca12dd8dc83;hp=9624814e880b877c4c31cc36e6bc6972fc594b6c;hpb=3a38ef48c9ae55b932b5639ac9ac3ccd56c7dd9f;p=sbcl.git diff --git a/src/compiler/typetran.lisp b/src/compiler/typetran.lisp index 9624814..612d2bc 100644 --- a/src/compiler/typetran.lisp +++ b/src/compiler/typetran.lisp @@ -58,16 +58,16 @@ ;;; spurious attempts at transformation (and possible repeated ;;; warnings.) (deftransform typep ((object type)) - (unless (constant-continuation-p type) + (unless (constant-lvar-p type) (give-up-ir1-transform "can't open-code test of non-constant type")) - `(typep object ',(continuation-value type))) + `(typep object ',(lvar-value type))) -;;; If the continuation OBJECT definitely is or isn't of the specified +;;; If the lvar OBJECT definitely is or isn't of the specified ;;; type, then return T or NIL as appropriate. Otherwise quietly ;;; GIVE-UP-IR1-TRANSFORM. (defun ir1-transform-type-predicate (object type) - (declare (type continuation object) (type ctype type)) - (let ((otype (continuation-type object))) + (declare (type lvar object) (type ctype type)) + (let ((otype (lvar-type object))) (cond ((not (types-equal-or-intersect otype type)) nil) ((csubtypep otype type) @@ -79,11 +79,11 @@ ;;; Flush %TYPEP tests whose result is known at compile time. (deftransform %typep ((object type)) - (unless (constant-continuation-p type) + (unless (constant-lvar-p type) (give-up-ir1-transform)) (ir1-transform-type-predicate object - (ir1-transform-specifier-type (continuation-value type)))) + (ir1-transform-specifier-type (lvar-value type)))) ;;; This is the IR1 transform for simple type predicates. It checks ;;; whether the single argument is known to (not) be of the @@ -91,7 +91,7 @@ (deftransform fold-type-predicate ((object) * * :node node :defun-only t) (let ((ctype (gethash (leaf-source-name (ref-leaf - (continuation-use + (lvar-uses (basic-combination-fun node)))) *backend-predicate-types*))) (aver ctype) @@ -100,7 +100,7 @@ ;;; If FIND-CLASS is called on a constant class, locate the CLASS-CELL ;;; at load time. (deftransform find-classoid ((name) ((constant-arg symbol)) *) - (let* ((name (continuation-value name)) + (let* ((name (lvar-value name)) (cell (find-classoid-cell name))) `(or (classoid-cell-classoid ',cell) (error "class not yet defined: ~S" name)))) @@ -148,6 +148,9 @@ (define-source-transform atom (x) `(not (consp ,x))) +#!+sb-unicode +(define-source-transform base-char-p (x) + `(typep ,x 'base-char)) ;;;; TYPEP source transform @@ -243,13 +246,13 @@ ;;; Do source transformation for TYPEP of a known union type. If a ;;; union type contains LIST, then we pull that out and make it into a -;;; single LISTP call. Note that if SYMBOL is in the union, then LIST -;;; will be a subtype even without there being any (member NIL). We -;;; just drop through to the general code in this case, rather than -;;; trying to optimize it. +;;; single LISTP call. Note that if SYMBOL is in the union, then LIST +;;; will be a subtype even without there being any (member NIL). We +;;; currently just drop through to the general code in this case, +;;; rather than trying to optimize it (but FIXME CSR 2004-04-05: it +;;; wouldn't be hard to optimize it after all). (defun source-transform-union-typep (object type) (let* ((types (union-type-types type)) - (type-list (specifier-type 'list)) (type-cons (specifier-type 'cons)) (mtype (find-if #'member-type-p types)) (members (when mtype (member-type-members mtype)))) @@ -292,6 +295,21 @@ `((typep (cdr ,n-obj) ',(type-specifier cdr-type)))))))))) +(defun source-transform-character-set-typep (object type) + (let ((pairs (character-set-type-pairs type))) + (if (and (= (length pairs) 1) + (= (caar pairs) 0) + (= (cdar pairs) (1- sb!xc:char-code-limit))) + `(characterp ,object) + (once-only ((n-obj object)) + (let ((n-code (gensym "CODE"))) + `(and (characterp ,n-obj) + (let ((,n-code (sb!xc:char-code ,n-obj))) + (or + ,@(loop for pair in pairs + collect + `(<= ,(car pair) ,n-code ,(cdr pair))))))))))) + ;;; Return the predicate and type from the most specific entry in ;;; *TYPE-PREDICATES* that is a supertype of TYPE. (defun find-supertype-predicate (type) @@ -309,12 +327,13 @@ ;;; Return forms to test that OBJ has the rank and dimensions ;;; specified by TYPE, where STYPE is the type we have checked against -;;; (which is the same but for dimensions.) +;;; (which is the same but for dimensions and element type). (defun test-array-dimensions (obj type stype) (declare (type array-type type stype)) (let ((obj `(truly-the ,(type-specifier stype) ,obj)) (dims (array-type-dimensions type))) - (unless (eq dims '*) + (unless (or (eq dims '*) + (equal dims (array-type-dimensions stype))) (collect ((res)) (when (eq (array-type-dimensions stype) '*) (res `(= (array-rank ,obj) ,(length dims)))) @@ -326,6 +345,24 @@ (res `(= (array-dimension ,obj ,i) ,dim))))) (res))))) +;;; Return forms to test that OBJ has the element-type specified by +;;; type specified by TYPE, where STYPE is the type we have checked +;;; against (which is the same but for dimensions and element type). +(defun test-array-element-type (obj type stype) + (declare (type array-type type stype)) + (let ((obj `(truly-the ,(type-specifier stype) ,obj)) + (eltype (array-type-specialized-element-type type))) + (unless (type= eltype (array-type-specialized-element-type stype)) + (with-unique-names (data) + `((do ((,data ,obj (%array-data-vector ,data))) + ((not (array-header-p ,data)) + ;; KLUDGE: this isn't in fact maximally efficient, + ;; because though we know that DATA is a (SIMPLE-ARRAY * + ;; (*)), we will still check to see if the lowtag is + ;; appropriate. + (typep ,data + '(simple-array ,(type-specifier eltype) (*)))))))))) + ;;; If we can find a type predicate that tests for the type without ;;; dimensions, then use that predicate and test for dimensions. ;;; Otherwise, just do %TYPEP. @@ -336,12 +373,11 @@ ;; not safe to assume here that it will eventually ;; have (UPGRADED-ARRAY-ELEMENT-TYPE type)=T, so punt.) (not (unknown-type-p (array-type-element-type type))) - (type= (array-type-specialized-element-type stype) - (array-type-specialized-element-type type)) (eq (array-type-complexp stype) (array-type-complexp type))) (once-only ((n-obj obj)) `(and (,pred ,n-obj) - ,@(test-array-dimensions n-obj type stype))) + ,@(test-array-dimensions n-obj type stype) + ,@(test-array-element-type n-obj type stype))) `(%typep ,obj ',(type-specifier type))))) ;;; Transform a type test against some instance type. The type test is @@ -353,11 +389,11 @@ ;;; and signal an error if so. Otherwise, look up the indirect ;;; class-cell and call CLASS-CELL-TYPEP at runtime. (deftransform %instance-typep ((object spec) (* *) * :node node) - (aver (constant-continuation-p spec)) - (let* ((spec (continuation-value spec)) + (aver (constant-lvar-p spec)) + (let* ((spec (lvar-value spec)) (class (specifier-type spec)) (name (classoid-name class)) - (otype (continuation-type object)) + (otype (lvar-type object)) (layout (let ((res (info :type :compiler-layout name))) (if (and res (not (layout-invalid res))) res @@ -371,7 +407,7 @@ ;; If not properly named, error. ((not (and name (eq (find-classoid name) class))) (compiler-error "can't compile TYPEP of anonymous or undefined ~ - class:~% ~S" + class:~% ~S" class)) (t ;; Delay the type transform to give type propagation a chance. @@ -456,7 +492,7 @@ ;; 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 + ;; lvar, 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)) @@ -478,7 +514,7 @@ (intersection-type (source-transform-intersection-typep object type)) (member-type - `(member ,object ',(member-type-members type))) + `(if (member ,object ',(member-type-members type)) t)) (args-type (compiler-warn "illegal type specifier for TYPEP: ~S" (cadr spec)) @@ -493,21 +529,33 @@ (source-transform-array-typep object type)) (cons-type (source-transform-cons-typep object type)) + (character-set-type + (source-transform-character-set-typep object type)) (t nil)) `(%typep ,object ,spec))) (values nil t))) ;;;; coercion +;;; Constant-folding. +;;; +#-sb-xc-host +(defoptimizer (coerce optimizer) ((x type) node) + (when (and (constant-lvar-p x) (constant-lvar-p type)) + (let ((value (lvar-value x))) + (when (or (numberp value) (characterp value)) + (constant-fold-call node) + t)))) + (deftransform coerce ((x type) (* *) * :node node) - (unless (constant-continuation-p type) + (unless (constant-lvar-p type) (give-up-ir1-transform)) - (let ((tspec (ir1-transform-specifier-type (continuation-value type)))) - (if (csubtypep (continuation-type x) tspec) + (let ((tspec (ir1-transform-specifier-type (lvar-value type)))) + (if (csubtypep (lvar-type x) tspec) 'x ;; Note: The THE here makes sure that specifiers like ;; (SINGLE-FLOAT 0.0 1.0) can raise a TYPE-ERROR. - `(the ,(continuation-value type) + `(the ,(lvar-value type) ,(cond ((csubtypep tspec (specifier-type 'double-float)) '(%double-float x))