projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.pre7.14:
[sbcl.git]
/
src
/
compiler
/
ctype.lisp
diff --git
a/src/compiler/ctype.lisp
b/src/compiler/ctype.lisp
index
e94c732
..
948c0df
100644
(file)
--- a/
src/compiler/ctype.lisp
+++ b/
src/compiler/ctype.lisp
@@
-423,7
+423,8
@@
(values boolean boolean))
valid-approximate-type))
(defun valid-approximate-type (call-type type &optional
(values boolean boolean))
valid-approximate-type))
(defun valid-approximate-type (call-type type &optional
- (*test-function* #'types-intersect)
+ (*test-function*
+ #'types-equal-or-intersect)
(*error-function*
#'compiler-style-warning)
(*warning-function* #'compiler-note))
(*error-function*
#'compiler-style-warning)
(*warning-function* #'compiler-note))
@@
-730,7
+731,8
@@
(atype (when return
(continuation-asserted-type (return-result return)))))
(cond
(atype (when return
(continuation-asserted-type (return-result return)))))
(cond
- ((and atype (not (values-types-intersect atype type-returns)))
+ ((and atype (not (values-types-equal-or-intersect atype
+ type-returns)))
(note-lossage
"The result type from ~A:~% ~S~@
conflicts with the definition's result type assertion:~% ~S"
(note-lossage
"The result type from ~A:~% ~S~@
conflicts with the definition's result type assertion:~% ~S"