projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.6.12.13:
[sbcl.git]
/
src
/
compiler
/
locall.lisp
diff --git
a/src/compiler/locall.lisp
b/src/compiler/locall.lisp
index
8c18432
..
c423a66
100644
(file)
--- 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))
(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))))
`(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)))
(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)))
(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))))
(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))
(let ((home (node-home-lambda ref)))
(unless (eq home fun)
(when call-fun (return nil))