X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fsrctran.lisp;h=462e4494f7ca2ca55fd99668bdcb67c7fca3c22f;hb=22b819c0cd0ca0ea5be52ba280b9e9e0b8e86210;hp=363e3c69016bffa2480e291314af63473ca6d755;hpb=8fb02633217a721b85487531709779f338d02438;p=sbcl.git diff --git a/src/compiler/srctran.lisp b/src/compiler/srctran.lisp index 363e3c6..462e449 100644 --- a/src/compiler/srctran.lisp +++ b/src/compiler/srctran.lisp @@ -31,8 +31,7 @@ ;;; Bind the value and make a closure that returns it. (define-source-transform constantly (value) - (let ((rest (gensym "CONSTANTLY-REST-")) - (n-value (gensym "CONSTANTLY-VALUE-"))) + (with-unique-names (rest n-value) `(let ((,n-value ,value)) (lambda (&rest ,rest) (declare (ignore ,rest)) @@ -817,7 +816,6 @@ ;;; are equal to an intermediate convention for which they are ;;; considered different which is more natural for some of the ;;; optimisers. -#!-negative-zero-is-not-zero (defun convert-numeric-type (type) (declare (type numeric-type type)) ;;; Only convert real float interval delimiters types. @@ -836,11 +834,11 @@ :low (if lo-float-zero-p (if (consp lo) (list (float 0.0 lo-val)) - (float -0.0 lo-val)) + (float (load-time-value (make-unportable-float :single-float-negative-zero)) lo-val)) lo) :high (if hi-float-zero-p (if (consp hi) - (list (float -0.0 hi-val)) + (list (float (load-time-value (make-unportable-float :single-float-negative-zero)) hi-val)) (float 0.0 hi-val)) hi)) type)) @@ -850,7 +848,6 @@ ;;; Convert back from the intermediate convention for which -0.0 and ;;; 0.0 are considered different to the standard type convention for ;;; which and equal. -#!-negative-zero-is-not-zero (defun convert-back-numeric-type (type) (declare (type numeric-type type)) ;;; Only convert real float interval delimiters types. @@ -938,7 +935,6 @@ type)) ;;; Convert back a possible list of numeric types. -#!-negative-zero-is-not-zero (defun convert-back-numeric-type-list (type-list) (typecase type-list (list @@ -960,7 +956,9 @@ ;;; FIXME: MAKE-CANONICAL-UNION-TYPE and CONVERT-MEMBER-TYPE probably ;;; belong in the kernel's type logic, invoked always, instead of in -;;; the compiler, invoked only during some type optimizations. +;;; the compiler, invoked only during some type optimizations. (In +;;; fact, as of 0.pre8.100 or so they probably are, under +;;; MAKE-MEMBER-TYPE, so probably this code can be deleted) ;;; Take a list of types and return a canonical type specifier, ;;; combining any MEMBER types together. If both positive and negative @@ -975,24 +973,15 @@ (setf members (union members (member-type-members type))) (push type misc-types))) #!+long-float - (when (null (set-difference '(-0l0 0l0) members)) - #!-negative-zero-is-not-zero - (push (specifier-type '(long-float 0l0 0l0)) misc-types) - #!+negative-zero-is-not-zero - (push (specifier-type '(long-float -0l0 0l0)) misc-types) - (setf members (set-difference members '(-0l0 0l0)))) - (when (null (set-difference '(-0d0 0d0) members)) - #!-negative-zero-is-not-zero - (push (specifier-type '(double-float 0d0 0d0)) misc-types) - #!+negative-zero-is-not-zero - (push (specifier-type '(double-float -0d0 0d0)) misc-types) - (setf members (set-difference members '(-0d0 0d0)))) - (when (null (set-difference '(-0f0 0f0) members)) - #!-negative-zero-is-not-zero - (push (specifier-type '(single-float 0f0 0f0)) misc-types) - #!+negative-zero-is-not-zero - (push (specifier-type '(single-float -0f0 0f0)) misc-types) - (setf members (set-difference members '(-0f0 0f0)))) + (when (null (set-difference `(,(load-time-value (make-unportable-float :long-float-negative-zero)) 0.0l0) members)) + (push (specifier-type '(long-float 0.0l0 0.0l0)) misc-types) + (setf members (set-difference members `(,(load-time-value (make-unportable-float :long-float-negative-zero)) 0.0l0)))) + (when (null (set-difference `(,(load-time-value (make-unportable-float :double-float-negative-zero)) 0.0d0) members)) + (push (specifier-type '(double-float 0.0d0 0.0d0)) misc-types) + (setf members (set-difference members `(,(load-time-value (make-unportable-float :double-float-negative-zero)) 0.0d0)))) + (when (null (set-difference `(,(load-time-value (make-unportable-float :single-float-negative-zero)) 0.0f0) members)) + (push (specifier-type '(single-float 0.0f0 0.0f0)) misc-types) + (setf members (set-difference members `(,(load-time-value (make-unportable-float :single-float-negative-zero)) 0.0f0)))) (if members (apply #'type-union (make-member-type :members members) misc-types) (apply #'type-union misc-types)))) @@ -1023,8 +1012,7 @@ (defun one-arg-derive-type (arg derive-fcn member-fcn &optional (convert-type t)) (declare (type function derive-fcn) - (type (or null function) member-fcn) - #!+negative-zero-is-not-zero (ignore convert-type)) + (type (or null function) member-fcn)) (let ((arg-list (prepare-arg-for-derive-type (continuation-type arg)))) (when arg-list (flet ((deriver (x) @@ -1040,20 +1028,14 @@ ;; Otherwise convert to a numeric type. (let ((result-type-list (funcall derive-fcn (convert-member-type x)))) - #!-negative-zero-is-not-zero (if convert-type (convert-back-numeric-type-list result-type-list) - result-type-list) - #!+negative-zero-is-not-zero - result-type-list))) + result-type-list)))) (numeric-type - #!-negative-zero-is-not-zero (if convert-type (convert-back-numeric-type-list (funcall derive-fcn (convert-numeric-type x))) - (funcall derive-fcn x)) - #!+negative-zero-is-not-zero - (funcall derive-fcn x)) + (funcall derive-fcn x))) (t *universal-type*)))) ;; Run down the list of args and derive the type of each one, @@ -1077,10 +1059,7 @@ (defun two-arg-derive-type (arg1 arg2 derive-fcn fcn &optional (convert-type t)) (declare (type function derive-fcn fcn)) - #!+negative-zero-is-not-zero - (declare (ignore convert-type)) - (flet (#!-negative-zero-is-not-zero - (deriver (x y same-arg) + (flet ((deriver (x y same-arg) (cond ((and (member-type-p x) (member-type-p y)) (let* ((x (first (member-type-members x))) (y (first (member-type-members y))) @@ -1117,26 +1096,6 @@ (convert-back-numeric-type-list result) result))) (t - *universal-type*))) - #!+negative-zero-is-not-zero - (deriver (x y same-arg) - (cond ((and (member-type-p x) (member-type-p y)) - (let* ((x (first (member-type-members x))) - (y (first (member-type-members y))) - (result (with-float-traps-masked - (:underflow :overflow :divide-by-zero) - (funcall fcn x y)))) - (if result - (make-member-type :members (list result))))) - ((and (member-type-p x) (numeric-type-p y)) - (let ((x (convert-member-type x))) - (funcall derive-fcn x y same-arg))) - ((and (numeric-type-p x) (member-type-p y)) - (let ((y (convert-member-type y))) - (funcall derive-fcn x y same-arg))) - ((and (numeric-type-p x) (numeric-type-p y)) - (funcall derive-fcn x y same-arg)) - (t *universal-type*)))) (let ((same-arg (same-leaf-ref-p arg1 arg2)) (a1 (prepare-arg-for-derive-type (continuation-type arg1)))