X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftypetran.lisp;h=9624814e880b877c4c31cc36e6bc6972fc594b6c;hb=eb6f8dd033501c7372b27967a2cb7750560897bd;hp=ad9986e129c4e1c9493e24d8a1454bbb909df196;hpb=8ac4c19014a23665e5842d0a989cb9d22d1592ed;p=sbcl.git diff --git a/src/compiler/typetran.lisp b/src/compiler/typetran.lisp index ad9986e..9624814 100644 --- a/src/compiler/typetran.lisp +++ b/src/compiler/typetran.lisp @@ -72,6 +72,8 @@ nil) ((csubtypep otype type) t) + ((eq type *empty-type*) + nil) (t (give-up-ir1-transform))))) @@ -97,10 +99,10 @@ ;;; If FIND-CLASS is called on a constant class, locate the CLASS-CELL ;;; at load time. -(deftransform find-class ((name) ((constant-arg symbol)) *) +(deftransform find-classoid ((name) ((constant-arg symbol)) *) (let* ((name (continuation-value name)) - (cell (find-class-cell name))) - `(or (class-cell-class ',cell) + (cell (find-classoid-cell name))) + `(or (classoid-cell-classoid ',cell) (error "class not yet defined: ~S" name)))) ;;;; standard type predicates, i.e. those defined in package COMMON-LISP, @@ -153,7 +155,6 @@ ;;; binds specified by TYPE. BASE is the name of the base type, for ;;; declaration. We make SAFETY locally 0 to inhibit any checking of ;;; this assertion. -#!-negative-zero-is-not-zero (defun transform-numeric-bound-test (n-object type base) (declare (type numeric-type type)) (let ((low (numeric-type-low type)) @@ -162,55 +163,12 @@ (declare (optimize (safety 0))) (and ,@(when low (if (consp low) - `((> (the ,base ,n-object) ,(car low))) - `((>= (the ,base ,n-object) ,low)))) + `((> (truly-the ,base ,n-object) ,(car low))) + `((>= (truly-the ,base ,n-object) ,low)))) ,@(when high (if (consp high) - `((< (the ,base ,n-object) ,(car high))) - `((<= (the ,base ,n-object) ,high)))))))) - -#!+negative-zero-is-not-zero -(defun transform-numeric-bound-test (n-object type base) - (declare (type numeric-type type)) - (let ((low (numeric-type-low type)) - (high (numeric-type-high type)) - (float-type-p (csubtypep type (specifier-type 'float))) - (x (gensym)) - (y (gensym))) - `(locally - (declare (optimize (safety 0))) - (and ,@(when low - (if (consp low) - `((let ((,x (the ,base ,n-object)) - (,y ,(car low))) - ,(if (not float-type-p) - `(> ,x ,y) - `(if (and (zerop ,x) (zerop ,y)) - (> (float-sign ,x) (float-sign ,y)) - (> ,x ,y))))) - `((let ((,x (the ,base ,n-object)) - (,y ,low)) - ,(if (not float-type-p) - `(>= ,x ,y) - `(if (and (zerop ,x) (zerop ,y)) - (>= (float-sign ,x) (float-sign ,y)) - (>= ,x ,y))))))) - ,@(when high - (if (consp high) - `((let ((,x (the ,base ,n-object)) - (,y ,(car high))) - ,(if (not float-type-p) - `(< ,x ,y) - `(if (and (zerop ,x) (zerop ,y)) - (< (float-sign ,x) (float-sign ,y)) - (< ,x ,y))))) - `((let ((,x (the ,base ,n-object)) - (,y ,high)) - ,(if (not float-type-p) - `(<= ,x ,y) - `(if (and (zerop ,x) (zerop ,y)) - (<= (float-sign ,x) (float-sign ,y)) - (<= ,x ,y))))))))))) + `((< (truly-the ,base ,n-object) ,(car high))) + `((<= (truly-the ,base ,n-object) ,high)))))))) ;;; Do source transformation of a test of a known numeric type. We can ;;; assume that the type doesn't have a corresponding predicate, since @@ -231,7 +189,11 @@ (defun source-transform-numeric-typep (object type) (let* ((class (numeric-type-class type)) (base (ecase class - (integer (containing-integer-type type)) + (integer (containing-integer-type + (if (numeric-type-complexp type) + (modified-numeric-type type + :complexp :real) + type))) (rational 'rational) (float (or (numeric-type-format type) 'float)) ((nil) 'real)))) @@ -242,8 +204,8 @@ ,(transform-numeric-bound-test n-object type base))) (:complex `(and (complexp ,n-object) - ,(once-only ((n-real `(realpart (the complex ,n-object))) - (n-imag `(imagpart (the complex ,n-object)))) + ,(once-only ((n-real `(realpart (truly-the complex ,n-object))) + (n-imag `(imagpart (truly-the complex ,n-object)))) `(progn ,n-imag ; ignorable (and (typep ,n-real ',base) @@ -262,8 +224,8 @@ (let ((spec (hairy-type-specifier type))) (cond ((unknown-type-p type) (when (policy *lexenv* (> speed inhibit-warnings)) - (compiler-note "can't open-code test of unknown type ~S" - (type-specifier type))) + (compiler-notify "can't open-code test of unknown type ~S" + (type-specifier type))) `(%typep ,object ',spec)) (t (ecase (first spec) @@ -274,6 +236,11 @@ `(typep ,n-obj ',x)) (rest spec)))))))))) +(defun source-transform-negation-typep (object type) + (declare (type negation-type type)) + (let ((spec (type-specifier (negation-type-type type)))) + `(not (typep ,object ',spec)))) + ;;; 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 @@ -282,17 +249,20 @@ ;;; trying to optimize it. (defun source-transform-union-typep (object type) (let* ((types (union-type-types type)) - (ltype (specifier-type 'list)) - (mtype (find-if #'member-type-p 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))))))) + (type-list (specifier-type 'list)) + (type-cons (specifier-type 'cons)) + (mtype (find-if #'member-type-p types)) + (members (when mtype (member-type-members mtype)))) + (if (and mtype + (memq nil members) + (memq type-cons types)) + (once-only ((n-obj object)) + `(or (listp ,n-obj) + (typep ,n-obj + '(or ,@(mapcar #'type-specifier + (remove type-cons + (remove mtype types))) + (member ,@(remove nil members)))))) (once-only ((n-obj object)) `(or ,@(mapcar (lambda (x) `(typep ,n-obj ',(type-specifier x))) @@ -309,10 +279,8 @@ (defun source-transform-cons-typep (object type) (let* ((car-type (cons-type-car-type type)) (cdr-type (cons-type-cdr-type type))) - (let ((car-test-p (not (or (type= car-type *wild-type*) - (type= car-type (specifier-type t))))) - (cdr-test-p (not (or (type= cdr-type *wild-type*) - (type= cdr-type (specifier-type t)))))) + (let ((car-test-p (not (type= car-type *universal-type*))) + (cdr-test-p (not (type= cdr-type *universal-type*)))) (if (and (not car-test-p) (not cdr-test-p)) `(consp ,object) (once-only ((n-obj object)) @@ -388,7 +356,7 @@ (aver (constant-continuation-p spec)) (let* ((spec (continuation-value spec)) (class (specifier-type spec)) - (name (sb!xc:class-name class)) + (name (classoid-name class)) (otype (continuation-type object)) (layout (let ((res (info :type :compiler-layout name))) (if (and res (not (layout-invalid res))) @@ -401,7 +369,7 @@ ((csubtypep otype class) t) ;; If not properly named, error. - ((not (and name (eq (sb!xc:find-class name) class))) + ((not (and name (eq (find-classoid name) class))) (compiler-error "can't compile TYPEP of anonymous or undefined ~ class:~% ~S" class)) @@ -419,8 +387,8 @@ (t (values '(lambda (x) (declare (ignore x)) t) 'layout-of))) (cond - ((and (eq (class-state class) :sealed) layout - (not (class-subclasses class))) + ((and (eq (classoid-state class) :sealed) layout + (not (classoid-subclasses class))) ;; Sealed and has no subclasses. (let ((n-layout (gensym))) `(and (,pred object) @@ -429,7 +397,7 @@ `((when (layout-invalid ,n-layout) (%layout-invalid-error object ',layout)))) (eq ,n-layout ',layout))))) - ((and (typep class 'basic-structure-class) layout) + ((and (typep class 'basic-structure-classoid) layout) ;; structure type tests; hierarchical layout depths (let ((depthoid (layout-depthoid layout)) (n-layout (gensym))) @@ -467,9 +435,9 @@ (t (/noshow "default case -- ,PRED and CLASS-CELL-TYPEP") `(and (,pred object) - (class-cell-typep (,get-layout object) - ',(find-class-cell name) - object))))))))) + (classoid-cell-typep (,get-layout object) + ',(find-classoid-cell name) + object))))))))) ;;; If the specifier argument is a quoted constant, then we consider ;;; converting into a simple predicate or other stuff. If the type is @@ -503,6 +471,8 @@ (typecase type (hairy-type (source-transform-hairy-typep object type)) + (negation-type + (source-transform-negation-typep object type)) (union-type (source-transform-union-typep object type)) (intersection-type @@ -517,7 +487,7 @@ (typecase type (numeric-type (source-transform-numeric-typep object type)) - (sb!xc:class + (classoid `(%instance-typep ,object ,spec)) (array-type (source-transform-array-typep object type)) @@ -529,7 +499,7 @@ ;;;; coercion -(deftransform coerce ((x type) (* *) *) +(deftransform coerce ((x type) (* *) * :node node) (unless (constant-continuation-p type) (give-up-ir1-transform)) (let ((tspec (ir1-transform-specifier-type (continuation-value type)))) @@ -544,8 +514,18 @@ ;; FIXME: #!+long-float (t ,(error "LONG-FLOAT case needed")) ((csubtypep tspec (specifier-type 'float)) '(%single-float x)) - ((csubtypep tspec (specifier-type 'simple-vector)) - '(coerce-to-simple-vector x)) + ((and (csubtypep tspec (specifier-type 'simple-vector)) + ;; Can we avoid checking for dimension issues like + ;; (COERCE FOO '(SIMPLE-VECTOR 5)) returning a + ;; vector of length 6? + (or (policy node (< safety 3)) ; no need in unsafe code + (and (array-type-p tspec) ; no need when no dimensions + (equal (array-type-dimensions tspec) '(*))))) + `(if (simple-vector-p x) + x + (replace (make-array (length x)) x))) + ;; FIXME: other VECTOR types? (t (give-up-ir1-transform))))))) +