X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Flocall.lisp;h=c423a66dd61093e80ecacbc6113a9afa6a6ac458;hb=31361af9eb64344f521abbb245ea784c76c746e5;hp=8c1843263048c39008176a91601c3e906d0d8386;hpb=6c765578c8dc4bcc7798e37c9918715f198b30da;p=sbcl.git

diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp
index 8c18432..c423a66 100644
--- a/src/compiler/locall.lisp
+++ b/src/compiler/locall.lisp
@@ -130,7 +130,7 @@
 	   (temps (make-gensym-list (length (lambda-vars fun)))))
        `(lambda (,n-supplied ,@temps)
 	  (declare (type index ,n-supplied))
-	  ,(if (policy nil (zerop safety))
+	  ,(if (policy *lexenv* (zerop safety))
 	       `(declare (ignore ,n-supplied))
 	       `(%verify-argument-count ,n-supplied ,nargs))
 	  (%funcall ,fun ,@temps))))
@@ -873,7 +873,8 @@
 	       (not (functional-entry-function fun)))
       (let* ((ref-cont (node-cont (first refs)))
 	     (dest (continuation-dest ref-cont)))
-	(when (and (basic-combination-p dest)
+	(when (and dest
+                   (basic-combination-p dest)
 		   (eq (basic-combination-fun dest) ref-cont)
 		   (eq (basic-combination-kind dest) :local)
 		   (not (block-delete-p (node-block dest)))
@@ -964,7 +965,9 @@
 	  (call-fun nil))
       (when (and (dolist (ref (leaf-refs fun) t)
 		   (let ((dest (continuation-dest (node-cont ref))))
-		     (when (block-delete-p (node-block dest)) (return nil))
+		     (when (or (not dest)
+                               (block-delete-p (node-block dest)))
+                       (return nil))
 		     (let ((home (node-home-lambda ref)))
 		       (unless (eq home fun)
 			 (when call-fun (return nil))