X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1opt.lisp;h=0cac21d6416ac6efd19a1930b90ce375018752b6;hb=d0552bdb80b50eb2c600de19b89b2d7139c4841c;hp=3f83536c6ec062a6016fbf5ccaa417a05fdb2293;hpb=5b97c18e0f762a45300a86c53f0458d1ffc8eed3;p=sbcl.git

diff --git a/src/compiler/ir1opt.lisp b/src/compiler/ir1opt.lisp
index 3f83536..0cac21d 100644
--- a/src/compiler/ir1opt.lisp
+++ b/src/compiler/ir1opt.lisp
@@ -411,7 +411,8 @@
 		 (join-blocks block next))
 	       t)
               ((and (null (block-start-uses next))
-                    (not (exit-p (continuation-dest last-cont)))
+                    (not (typep (continuation-dest last-cont)
+                                '(or exit creturn)))
                     (null (continuation-lexenv-uses last-cont)))
                (assert (null (find-uses next-cont)))
                (when (continuation-dest last-cont)
@@ -934,7 +935,7 @@
 			;; issue a full WARNING if the call
 			;; violates a DECLAIM FTYPE.
 			:lossage-fun #'compiler-style-warn
-			:unwinnage-fun #'compiler-note)
+			:unwinnage-fun #'compiler-notify)
 	 (assert-call-type call type)
 	 (maybe-terminate-block call ir1-converting-not-optimizing-p)
 	 (recognize-known-call call ir1-converting-not-optimizing-p))