0.pre7.86.flaky7.23:

[sbcl.git] / src / compiler / gtn.lisp

diff --git a/src/compiler/gtn.lisp b/src/compiler/gtn.lisp
index b954bb7..876e14a 100644 (file)
--- a/src/compiler/gtn.lisp
+++ b/src/compiler/gtn.lisp
@@ -110,7 +110,7 @@
 ;;;    a non-standard convention.
 (defun use-standard-returns (tails)
   (declare (type tail-set tails))
-  (let ((funs (tail-set-functions tails)))
+  (let ((funs (tail-set-funs tails)))
     (or (and (find-if #'external-entry-point-p funs)
             (find-if #'has-full-call-use funs))
        (block punt
@@ -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))
@@ -141,7 +141,8 @@
                      "Return value count mismatch prevents known return ~
                       from these functions:~
                       ~{~%  ~A~}"
-                     (remove nil (mapcar #'leaf-name funs)))))
+                     (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)))