0.9.5.50:

	Fix for type-intersection2 failed aver (nikodemus on #lisp)
	... actually I think the aver is just wrong.

diff --git a/src/code/late-type.lisp b/src/code/late-type.lisp
index bf179ac..08adf4d 100644 (file)
--- a/src/code/late-type.lisp
+++ b/src/code/late-type.lisp
@@ -849,7 +849,6 @@
                             (eql yx :call-other-method))
                        *empty-type*)
                       (t
-                       (aver (and (not xy) (not yx))) ; else handled above
                        nil))))))))
 
 (defun-cached (type-intersection2 :hash-function type-cache-hash

diff --git a/tests/type.pure.lisp b/tests/type.pure.lisp
index 05e7a30..3c42e2d 100644 (file)
--- a/tests/type.pure.lisp
+++ b/tests/type.pure.lisp
@@ -294,9 +294,13 @@ ACTUAL ~D DERIVED ~D~%"
     (subtypep 'generic-function 'function)
   (assert yes)
   (assert win))
-;; this would be in some internal test suite like type.before-xc.lisp
-;; except that generic functions don't exist at that stage.
+;;; this would be in some internal test suite like type.before-xc.lisp
+;;; except that generic functions don't exist at that stage.
 (multiple-value-bind (yes win)
     (subtypep 'generic-function 'sb-kernel:funcallable-instance)
   (assert yes)
   (assert win))
+
+;;; all sorts of answers are right for this one, but it used to
+;;; trigger an AVER instead.
+(subtypep '(function ()) '(and (function ()) (satisfies identity)))

diff --git a/version.lisp-expr b/version.lisp-expr
index 1368416..f104936 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.5.49"
+"0.9.5.50"