projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.9.10: make tests clean up after themselves a bit better
[sbcl.git]
/
src
/
compiler
/
stack.lisp
diff --git
a/src/compiler/stack.lisp
b/src/compiler/stack.lisp
index
fccf4f8
..
4ac4c7a
100644
(file)
--- a/
src/compiler/stack.lisp
+++ b/
src/compiler/stack.lisp
@@
-22,17
+22,17
@@
;;; invariant that all pushes come after the last pop.
(defun find-pushed-lvars (block)
(let* ((2block (block-info block))
;;; invariant that all pushes come after the last pop.
(defun find-pushed-lvars (block)
(let* ((2block (block-info block))
- (popped (ir2-block-popped 2block))
- (last-pop (if popped
- (lvar-dest (car (last popped)))
- nil)))
+ (popped (ir2-block-popped 2block))
+ (last-pop (if popped
+ (lvar-dest (car (last popped)))
+ nil)))
(collect ((pushed))
(let ((saw-last nil))
(collect ((pushed))
(let ((saw-last nil))
- (do-nodes (node lvar block)
- (when (eq node last-pop)
- (setq saw-last t))
+ (do-nodes (node lvar block)
+ (when (eq node last-pop)
+ (setq saw-last t))
- (when (and lvar
+ (when (and lvar
(or (lvar-dynamic-extent lvar)
(let ((dest (lvar-dest lvar))
(2lvar (lvar-info lvar)))
(or (lvar-dynamic-extent lvar)
(let ((dest (lvar-dest lvar))
(2lvar (lvar-info lvar)))
@@
-96,7
+96,6
@@
(let* ((generator (lvar-use lvar))
(block (node-block generator))
(2block (block-info block)))
(let* ((generator (lvar-use lvar))
(block (node-block generator))
(2block (block-info block)))
- (aver (eq generator (block-last block)))
;; DX objects, living in the LVAR, are
;; alive in the environment, protected by
;; the CLEANUP. We also cannot move them
;; DX objects, living in the LVAR, are
;; alive in the environment, protected by
;; the CLEANUP. We also cannot move them
@@
-278,9
+277,9
@@
(collect ((res nil adjoin))
(dolist (rec receivers)
(dolist (pop (ir2-block-popped (block-info rec)))
(collect ((res nil adjoin))
(dolist (rec receivers)
(dolist (pop (ir2-block-popped (block-info rec)))
- (do-uses (use pop)
- (unless (exit-p use)
- (res (node-block use))))))
+ (do-uses (use pop)
+ (unless (exit-p use)
+ (res (node-block use))))))
(dolist (dx-lvar dx-lvars)
(do-uses (use dx-lvar)
(res (node-block use))))
(dolist (dx-lvar dx-lvars)
(do-uses (use dx-lvar)
(res (node-block use))))
@@
-294,8
+293,8
@@
(defun stack-analyze (component)
(declare (type component component))
(let* ((2comp (component-info component))
(defun stack-analyze (component)
(declare (type component component))
(let* ((2comp (component-info component))
- (receivers (ir2-component-values-receivers 2comp))
- (generators (find-pushing-blocks receivers
+ (receivers (ir2-component-values-receivers 2comp))
+ (generators (find-pushing-blocks receivers
(component-dx-lvars component))))
(dolist (block generators)
(component-dx-lvars component))))
(dolist (block generators)
@@
-312,10
+311,10
@@
(do-blocks (block component)
(let ((top (ir2-block-end-stack (block-info block))))
(do-blocks (block component)
(let ((top (ir2-block-end-stack (block-info block))))
- (dolist (succ (block-succ block))
- (when (and (block-start succ)
- (not (eq (ir2-block-start-stack (block-info succ))
- top)))
- (discard-unused-values block succ))))))
+ (dolist (succ (block-succ block))
+ (when (and (block-start succ)
+ (not (eq (ir2-block-start-stack (block-info succ))
+ top)))
+ (discard-unused-values block succ))))))
(values))
(values))