Skip to content
Snippets Groups Projects
Commit 943c6745 authored by ram's avatar ram
Browse files

Use block-environment instead of the obsolete block-lambda. Use block-start

to determine whether a block is a dummy head/tail, rather than block-lambda.
parent fde761ac
No related branches found
No related tags found
No related merge requests found
...@@ -95,9 +95,7 @@ ...@@ -95,9 +95,7 @@
(dolist (pred (block-pred block)) (dolist (pred (block-pred block))
(if (eq pred (component-head (block-component block))) (if (eq pred (component-head (block-component block)))
(assert (find block (assert (find block
(environment-nlx-info (environment-nlx-info (block-environment block))
(lambda-environment
(block-lambda block)))
:key #'nlx-info-target)) :key #'nlx-info-target))
(let ((pred-stack (ir2-block-end-stack (block-info pred)))) (let ((pred-stack (ir2-block-end-stack (block-info pred))))
(unless (tailp new-stack pred-stack) (unless (tailp new-stack pred-stack)
...@@ -236,7 +234,7 @@ ...@@ -236,7 +234,7 @@
(do-blocks (block component) (do-blocks (block component)
(let ((top (car (ir2-block-end-stack (block-info block))))) (let ((top (car (ir2-block-end-stack (block-info block)))))
(dolist (succ (block-succ block)) (dolist (succ (block-succ block))
(when (and (block-lambda succ) (when (and (block-start succ)
(not (eq (car (ir2-block-start-stack (block-info succ))) (not (eq (car (ir2-block-start-stack (block-info succ)))
top))) top)))
(discard-unused-values block succ)))))) (discard-unused-values block succ))))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment