X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgtn.lisp;h=0aa7f2bfac4f889c85bde5e326f8bd8f7011706d;hb=98a76d4426660876dec6649b1e228d2e5b47f579;hp=400ee93de0166f248e90298e2fa28fa8f104cce4;hpb=1a6def3955b715472eb2c75b15660912b9f90173;p=sbcl.git

diff --git a/src/compiler/gtn.lisp b/src/compiler/gtn.lisp
index 400ee93..0aa7f2b 100644
--- a/src/compiler/gtn.lisp
+++ b/src/compiler/gtn.lisp
@@ -73,9 +73,9 @@
 	      reversed-ir2-physenv-alist)))
 
     (let ((res (make-ir2-physenv
-		:environment (nreverse reversed-ir2-physenv-alist)
+		:closure (nreverse reversed-ir2-physenv-alist)
 		:return-pc-pass (make-return-pc-passing-location
-				 (external-entry-point-p clambda)))))
+				 (xep-p clambda)))))
       (setf (physenv-info lambda-physenv) res)
       (setf (ir2-physenv-old-fp res)
 	    (make-old-fp-save-location lambda-physenv))
@@ -110,8 +110,8 @@
 ;;;    a non-standard convention.
 (defun use-standard-returns (tails)
   (declare (type tail-set tails))
-  (let ((funs (tail-set-functions tails)))
-    (or (and (find-if #'external-entry-point-p funs)
+  (let ((funs (tail-set-funs tails)))
+    (or (and (find-if #'xep-p funs)
 	     (find-if #'has-full-call-use funs))
 	(block punt
 	  (dolist (fun funs t)
@@ -131,7 +131,7 @@
 ;;; there is no such function, then be more vague.
 (defun return-value-efficiency-note (tails)
   (declare (type tail-set tails))
-  (let ((funs (tail-set-functions tails)))
+  (let ((funs (tail-set-funs tails)))
     (when (policy (lambda-bind (first funs))
 		  (> (max speed space)
 		     inhibit-warnings))
@@ -192,7 +192,7 @@
 	 (return (lambda-return fun)))
     (when (and return
 	       (not (eq (return-info-kind returns) :unknown))
-	       (external-entry-point-p fun))
+	       (xep-p fun))
       (do-uses (use (return-result return))
 	(setf (node-tail-p use) nil))))
   (values))