X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgtn.lisp;h=571d82c727fde1802c4c9406773a505ba6a94949;hb=a41b3abd325afaabf14e444ad516c3e9833c3883;hp=0aa7f2bfac4f889c85bde5e326f8bd8f7011706d;hpb=b05f52060838600d14b5d8ad4604a61351dd7017;p=sbcl.git

diff --git a/src/compiler/gtn.lisp b/src/compiler/gtn.lisp
index 0aa7f2b..571d82c 100644
--- a/src/compiler/gtn.lisp
+++ b/src/compiler/gtn.lisp
@@ -137,7 +137,7 @@
 		     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~}"
@@ -150,7 +150,7 @@
 		(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"
 		     (type-specifier rtype)))
@@ -167,7 +167,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