projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.28.55: transform FILL to a UB*-BASH-FILL when possible
[sbcl.git]
/
src
/
compiler
/
constraint.lisp
diff --git
a/src/compiler/constraint.lisp
b/src/compiler/constraint.lisp
index
ba008cd
..
5a4c627
100644
(file)
--- a/
src/compiler/constraint.lisp
+++ b/
src/compiler/constraint.lisp
@@
-155,9
+155,10
@@
(defmacro do-conset-elements ((constraint conset &optional result) &body body)
(with-unique-names (vector index start end
(defmacro do-conset-elements ((constraint conset &optional result) &body body)
(with-unique-names (vector index start end
- ignore constraint-universe-end)
+ #-sb-xc-host ignore
+ #-sb-xc-host constraint-universe-end)
(let* ((constraint-universe #+sb-xc-host '*constraint-universe*
(let* ((constraint-universe #+sb-xc-host '*constraint-universe*
- #-sb-xc-host (gensym))
+ #-sb-xc-host (sb!xc:gensym "UNIVERSE"))
(with-array-data
#+sb-xc-host '(progn)
#-sb-xc-host `(with-array-data
(with-array-data
#+sb-xc-host '(progn)
#-sb-xc-host `(with-array-data
@@
-202,7
+203,7
@@
ret))
(defun %conset-grow (conset new-size)
ret))
(defun %conset-grow (conset new-size)
- (declare (index new-size))
+ (declare (type index new-size))
(setf (conset-vector conset)
(replace (the simple-bit-vector
(make-array
(setf (conset-vector conset)
(replace (the simple-bit-vector
(make-array
@@
-214,7
+215,7
@@
(declaim (inline conset-grow))
(defun conset-grow (conset new-size)
(declaim (inline conset-grow))
(defun conset-grow (conset new-size)
- (declare (index new-size))
+ (declare (type index new-size))
(when (< (length (conset-vector conset)) new-size)
(%conset-grow conset new-size))
(values))
(when (< (length (conset-vector conset)) new-size)
(%conset-grow conset new-size))
(values))
@@
-356,7
+357,7
@@
(let ((new (make-constraint (length *constraint-universe*)
kind x y not-p)))
(vector-push-extend new *constraint-universe*
(let ((new (make-constraint (length *constraint-universe*)
kind x y not-p)))
(vector-push-extend new *constraint-universe*
- (* 2 (length *constraint-universe*)))
+ (1+ (length *constraint-universe*)))
(conset-adjoin new (lambda-var-constraints x))
(when (lambda-var-p y)
(conset-adjoin new (lambda-var-constraints y)))
(conset-adjoin new (lambda-var-constraints x))
(when (lambda-var-p y)
(conset-adjoin new (lambda-var-constraints y)))
@@
-467,7
+468,8
@@
(ok-lvar-lambda-var (first args) constraints)
(if (ctype-p val)
val
(ok-lvar-lambda-var (first args) constraints)
(if (ctype-p val)
val
- (specifier-type val))
+ (let ((*compiler-error-context* use))
+ (specifier-type val)))
nil)))))
((eq eql)
(let* ((arg1 (first args))
nil)))))
((eq eql)
(let* ((arg1 (first args))