X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgtn.lisp;h=c1fb1c72e59ef4763f3461fe35012ca300f7048b;hb=b63c4fb9b98fa8188e17ba926e150ba417a74635;hp=b954bb77848c4b871d8670ddb6653d0cb4e64c0a;hpb=7fd2eb4b1bc68e8aaec233c4a39bdfc40225bda2;p=sbcl.git

diff --git a/src/compiler/gtn.lisp b/src/compiler/gtn.lisp
index b954bb7..c1fb1c7 100644
--- a/src/compiler/gtn.lisp
+++ b/src/compiler/gtn.lisp
@@ -68,14 +68,15 @@
 		      (if (lambda-var-indirect thing)
 			  *backend-t-primitive-type*
 			  (primitive-type (leaf-type thing))))
-		     (nlx-info *backend-t-primitive-type*))))
+		     (nlx-info *backend-t-primitive-type*)
+                     (clambda *backend-t-primitive-type*))))
 	(push (cons thing (make-normal-tn ptype))
 	      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))
@@ -84,12 +85,11 @@
 
   (values))
 
-;;; Return true if FUN's result continuation is used in a
-;;; tail-recursive full call. We only consider explicit :FULL calls.
-;;; It is assumed that known calls are never part of a tail-recursive
-;;; loop, so we don't need to enforce tail-recursion. In any case, we
-;;; don't know which known calls will actually be full calls until
-;;; after LTN.
+;;; Return true if FUN's result is used in a tail-recursive full
+;;; call. We only consider explicit :FULL calls. It is assumed that
+;;; known calls are never part of a tail-recursive loop, so we don't
+;;; need to enforce tail-recursion. In any case, we don't know which
+;;; known calls will actually be full calls until after LTN.
 (defun has-full-call-use (fun)
   (declare (type clambda fun))
   (let ((return (lambda-return fun)))
@@ -110,18 +110,17 @@
 ;;;    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)
 	    (dolist (ref (leaf-refs fun))
-	      (let* ((cont (node-cont ref))
-		     (dest (continuation-dest cont)))
-		(when (and dest
+	      (let* ((lvar (node-lvar ref))
+		     (dest (and lvar (lvar-dest lvar))))
+		(when (and (basic-combination-p dest)
 			   (not (node-tail-p dest))
-			   (basic-combination-p dest)
-			   (eq (basic-combination-fun dest) cont)
+			   (eq (basic-combination-fun dest) lvar)
 			   (eq (basic-combination-kind dest) :local))
 		  (return-from punt nil)))))))))
 
@@ -131,17 +130,18 @@
 ;;; 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))
       (dolist (fun funs
 		   (let ((*compiler-error-context* (lambda-bind (first funs))))
-		     (compiler-note
+		     (compiler-notify
 		      "Return value count mismatch prevents known return ~
-		       from these functions:~
-		       ~{~%  ~A~}"
-		      (remove nil (mapcar #'leaf-name funs)))))
+                       from these functions:~
+                       ~{~%  ~A~}"
+		      (mapcar #'leaf-source-name
+			      (remove-if-not #'leaf-has-source-name-p funs)))))
 	(let ((ret (lambda-return fun)))
 	  (when ret
 	    (let ((rtype (return-result-type ret)))
@@ -149,9 +149,9 @@
 		(declare (ignore ignore))
 		(when (eq count :unknown)
 		  (let ((*compiler-error-context* (lambda-bind fun)))
-		    (compiler-note
+		    (compiler-notify
 		     "Return type not fixed values, so can't use known return ~
-		      convention:~%  ~S"
+                      convention:~%  ~S"
 		     (type-specifier rtype)))
 		  (return)))))))))
   (values))
@@ -166,7 +166,8 @@
   (multiple-value-bind (types count) (values-types (tail-set-type tails))
     (let ((ptypes (mapcar #'primitive-type types))
 	  (use-standard (use-standard-returns tails)))
-      (when (and (eq count :unknown) (not use-standard))
+      (when (and (eq count :unknown) (not use-standard)
+                 (not (eq (tail-set-type tails) *empty-type*)))
 	(return-value-efficiency-note tails))
       (if (or (eq count :unknown) use-standard)
 	  (make-return-info :kind :unknown
@@ -191,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))
@@ -209,6 +210,8 @@
 	    (make-ir2-nlx-info
 	     :home (when (member (cleanup-kind (nlx-info-cleanup nlx))
 				 '(:block :tagbody))
-		     (make-normal-tn *backend-t-primitive-type*))
+                     (if (nlx-info-safe-p nlx)
+                         (make-normal-tn *backend-t-primitive-type*)
+                         (make-stack-pointer-tn)))
 	     :save-sp (make-nlx-sp-tn physenv)))))
   (values))