X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1util.lisp;h=79ca83e1489a444c5adce2870c8ef0ac82dd7d83;hb=b05f52060838600d14b5d8ad4604a61351dd7017;hp=4328b58883f2c9e46f8a3c3ee2734f27be40a41e;hpb=1bfc464c657a8f4ad24ef612f76a38d8f6f1bbad;p=sbcl.git

diff --git a/src/compiler/ir1util.lisp b/src/compiler/ir1util.lisp
index 4328b58..79ca83e 100644
--- a/src/compiler/ir1util.lisp
+++ b/src/compiler/ir1util.lisp
@@ -36,7 +36,7 @@
   (declare (type cblock block1 block2) (type node node)
 	   (type (or cleanup null) cleanup))
   (setf (component-reanalyze (block-component block1)) t)
-  (with-ir1-environment node
+  (with-belated-ir1-environment node
     (let* ((start (make-continuation))
 	   (block (continuation-starts-block start))
 	   (cont (make-continuation))
@@ -1072,11 +1072,11 @@
 	     (aver (and succ (null (cdr succ))))
 	     (cond
 	      ((member block succ)
-	       (with-ir1-environment node
+	       (with-belated-ir1-environment node
 		 (let ((exit (make-exit))
 		       (dummy (make-continuation)))
 		   (setf (continuation-next prev) nil)
-		   (prev-link exit prev)
+		   (link-node-to-previous-continuation exit prev)
 		   (add-continuation-use exit dummy)
 		   (setf (block-last block) exit)))
 	       (setf (node-prev node) nil)
@@ -1108,7 +1108,7 @@
 		     (not (block-delete-p block))))))))
 
 ;;; Delete all the blocks and functions in COMPONENT. We scan first
-;;; marking the blocks as delete-p to prevent weird stuff from being
+;;; marking the blocks as DELETE-P to prevent weird stuff from being
 ;;; triggered by deletion.
 (defun delete-component (component)
   (declare (type component component))
@@ -1261,9 +1261,10 @@
 	     (t
 	      (return nil)))))))
 
-;;; Return true if function is an XEP. This is true of normal XEPs
-;;; (:EXTERNAL kind) and top level lambdas (:TOPLEVEL kind.)
-(defun external-entry-point-p (fun)
+;;; Return true if function is an external entry point. This is true
+;;; of normal XEPs (:EXTERNAL kind) and also of top level lambdas
+;;; (:TOPLEVEL kind.)
+(defun xep-p (fun)
   (declare (type functional fun))
   (not (null (member (functional-kind fun) '(:external :toplevel)))))