projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.29.13: relax CAST-EXTERNALLY-CHECKABLE-P a bit
[sbcl.git]
/
src
/
code
/
target-error.lisp
diff --git
a/src/code/target-error.lisp
b/src/code/target-error.lisp
index
9bb1506
..
659ed28
100644
(file)
--- a/
src/code/target-error.lisp
+++ b/
src/code/target-error.lisp
@@
-19,12
+19,13
@@
;;; associated with Condition
(defvar *condition-restarts* ())
;;; associated with Condition
(defvar *condition-restarts* ())
+(defun muffle-warning-p (warning)
+ (declare (special *muffled-warnings*))
+ (typep warning *muffled-warnings*))
+
(defun initial-handler-clusters ()
`(((warning . ,#'(lambda (warning)
(defun initial-handler-clusters ()
`(((warning . ,#'(lambda (warning)
- (when (typep warning
- (locally
- (declare (special sb!ext:*muffled-warnings*))
- sb!ext:*muffled-warnings*))
+ (when (muffle-warning-p warning)
(muffle-warning warning)))))))
(defvar *handler-clusters* (initial-handler-clusters))
(muffle-warning warning)))))))
(defvar *handler-clusters* (initial-handler-clusters))
@@
-56,7
+57,6
@@
restarts associated with CONDITION (or with no condition) will be returned."
(setq other (append (cdr alist) other))))
(collect ((res))
(let ((stack *restart-test-stack*))
(setq other (append (cdr alist) other))))
(collect ((res))
(let ((stack *restart-test-stack*))
- (declare (optimize sb!c::stack-allocate-dynamic-extent))
(dolist (restart-cluster *restart-clusters*)
(dolist (restart restart-cluster)
(when (and (or (not condition)
(dolist (restart-cluster *restart-clusters*)
(dolist (restart restart-cluster)
(when (and (or (not condition)
@@
-69,7
+69,7
@@
restarts associated with CONDITION (or with no condition) will be returned."
;; duraction of the test call.
(not (memq restart stack))
(let ((*restart-test-stack* (cons restart stack)))
;; duraction of the test call.
(not (memq restart stack))
(let ((*restart-test-stack* (cons restart stack)))
- (declare (dynamic-extent *restart-test-stack*))
+ (declare (truly-dynamic-extent *restart-test-stack*))
(funcall (restart-test-function restart) condition)))
(res restart)))))
(res))))
(funcall (restart-test-function restart) condition)))
(res restart)))))
(res))))