X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Flocall.lisp;h=0e9ba01c102a9ccafa5c652119b8ad920a0a5ec3;hb=7b384da95e6a30e1434523213aeeed3a90448c78;hp=7edff1070b651073e9d65de9bf2fbfa6379ae8d1;hpb=a83191ce453e8bc92e9c773ac7ce1e0c59252d99;p=sbcl.git

diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp
index 7edff10..0e9ba01 100644
--- a/src/compiler/locall.lisp
+++ b/src/compiler/locall.lisp
@@ -281,7 +281,7 @@
 	(return))
       (let ((kind (functional-kind functional)))
 	(cond ((or (functional-somewhat-letlike-p functional)
-		   (eql kind :deleted))
+		   (memq kind '(:deleted :zombie)))
 	       (values)) ; nothing to do
 	      ((and (null (leaf-refs functional)) (eq kind nil)
 		    (not (functional-entry-fun functional)))
@@ -953,11 +953,17 @@
 ;;; new references to it.
 (defun let-convert (fun call)
   (declare (type clambda fun) (type basic-combination call))
-  (let ((next-block (if (node-tail-p call)
-			nil
-			(insert-let-body fun call))))
+  (let* ((next-block (insert-let-body fun call))
+         (next-block (if (node-tail-p call)
+                         nil
+                         next-block)))
     (move-return-stuff fun call next-block)
-    (merge-lets fun call)))
+    (merge-lets fun call)
+    (setf (node-tail-p call) nil)
+    ;; If CALL has a derive type NIL, it means that "its return" is
+    ;; unreachable, but the next BIND is still reachable; in order to
+    ;; not confuse MAYBE-TERMINATE-BLOCK...
+    (setf (node-derived-type call) *wild-type*)))
 
 ;;; Reoptimize all of CALL's args and its result.
 (defun reoptimize-call (call)