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

diff --git a/src/compiler/ir1util.lisp b/src/compiler/ir1util.lisp
index 4328b58..6dbca4d 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-ir1-environment-from-node node
     (let* ((start (make-continuation))
 	   (block (continuation-starts-block start))
 	   (cont (make-continuation))
@@ -247,6 +247,9 @@
 (defun node-block (node)
   (declare (type node node))
   (the cblock (continuation-block (node-prev node))))
+(defun node-component (node)
+  (declare (type node node))
+  (block-component (node-block node)))
 (defun node-physenv (node)
   (declare (type node node))
   (the physenv (lambda-physenv (node-home-lambda node))))
@@ -945,8 +948,8 @@
 	(unless (policy *compiler-error-context* (= inhibit-warnings 3))
 	  ;; ANSI section "3.2.5 Exceptional Situations in the Compiler"
 	  ;; requires this to be no more than a STYLE-WARNING.
-	  (compiler-style-warning "The variable ~S is defined but never used."
-				  (leaf-debug-name var)))
+	  (compiler-style-warn "The variable ~S is defined but never used."
+			       (leaf-debug-name var)))
 	(setf (leaf-ever-used var) t)))) ; to avoid repeated warnings? -- WHN
   (values))
 
@@ -1009,8 +1012,8 @@
 				    (not (eq pkg (symbol-package :end))))))
 			 (not (member first *deletion-ignored-objects*))
 			 (not (typep first '(or fixnum character)))
-			 (every #'(lambda (x)
-				    (present-in-form first x 0))
+			 (every (lambda (x)
+				  (present-in-form first x 0))
 				(source-path-forms path))
 			 (present-in-form first (find-original-source path)
 					  0)))
@@ -1072,11 +1075,11 @@
 	     (aver (and succ (null (cdr succ))))
 	     (cond
 	      ((member block succ)
-	       (with-ir1-environment node
+	       (with-ir1-environment-from-node 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 +1111,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 +1264,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)))))
 
@@ -1353,7 +1357,7 @@
     (handler-case (apply function args)
       (error (condition)
 	(let ((*compiler-error-context* node))
-	  (compiler-warning "Lisp error during ~A:~%~A" context condition)
+	  (compiler-warn "Lisp error during ~A:~%~A" context condition)
 	  (return-from careful-call (values nil nil))))))
    t))