projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.7.9.42:
[sbcl.git]
/
src
/
code
/
interr.lisp
diff --git
a/src/code/interr.lisp
b/src/code/interr.lisp
index
2ff5f81
..
4ee10ee
100644
(file)
--- a/
src/code/interr.lisp
+++ b/
src/code/interr.lisp
@@
-250,10
+250,12
@@
:format-arguments (list key-name)))
(deferr invalid-array-index-error (array bound index)
:format-arguments (list key-name)))
(deferr invalid-array-index-error (array bound index)
- (error 'simple-error
+ (error 'simple-type-error
:format-control
"invalid array index ~W for ~S (should be nonnegative and <~W)"
:format-control
"invalid array index ~W for ~S (should be nonnegative and <~W)"
- :format-arguments (list index array bound)))
+ :format-arguments (list index array bound)
+ :datum index
+ :expected-type `(integer 0 (,bound))))
(deferr object-not-simple-array-error (object)
(error 'type-error
(deferr object-not-simple-array-error (object)
(error 'type-error
@@
-448,10
+450,17
@@
(/show0 "about to bind ERROR-NUMBER and ARGUMENTS")
(multiple-value-bind (error-number arguments)
(sb!vm:internal-error-args alien-context)
(/show0 "about to bind ERROR-NUMBER and ARGUMENTS")
(multiple-value-bind (error-number arguments)
(sb!vm:internal-error-args alien-context)
+
+ ;; There's a limit to how much error reporting we can usefully
+ ;; do before initialization is complete, but try to be a little
+ ;; bit helpful before we die.
(/show0 "back from INTERNAL-ERROR-ARGS, ERROR-NUMBER=..")
(/hexstr error-number)
(/show0 "cold/low ARGUMENTS=..")
(/hexstr arguments)
(/show0 "back from INTERNAL-ERROR-ARGS, ERROR-NUMBER=..")
(/hexstr error-number)
(/show0 "cold/low ARGUMENTS=..")
(/hexstr arguments)
+ (unless *cold-init-complete-p*
+ (%primitive print "can't recover from error in cold init, halting")
+ (%primitive sb!c:halt))
(multiple-value-bind (name sb!debug:*stack-top-hint*)
(find-interrupted-name)
(multiple-value-bind (name sb!debug:*stack-top-hint*)
(find-interrupted-name)