projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.12.18: Rearranging COMPILER-ERROR protocol
[sbcl.git]
/
src
/
compiler
/
main.lisp
diff --git
a/src/compiler/main.lisp
b/src/compiler/main.lisp
index
ff1bcce
..
83c67e3
100644
(file)
--- a/
src/compiler/main.lisp
+++ b/
src/compiler/main.lisp
@@
-1061,11
+1061,9
@@
(catch 'process-toplevel-form-error-abort
(let* ((path (or (gethash form *source-paths*) (cons form path)))
(*compiler-error-bailout*
(catch 'process-toplevel-form-error-abort
(let* ((path (or (gethash form *source-paths*) (cons form path)))
(*compiler-error-bailout*
- (lambda ()
+ (lambda (&optional condition)
(convert-and-maybe-compile
(convert-and-maybe-compile
- `(error 'simple-program-error
- :format-control "execution of a form compiled with errors:~% ~S"
- :format-arguments (list ',form))
+ (make-compiler-error-form condition form)
path)
(throw 'process-toplevel-form-error-abort nil))))
path)
(throw 'process-toplevel-form-error-abort nil))))
@@
-1695,11
+1693,11
@@
(throw 'pending-init circular-ref)))
(multiple-value-bind (creation-form init-form)
(handler-case
(throw 'pending-init circular-ref)))
(multiple-value-bind (creation-form init-form)
(handler-case
- (sb!xc:make-load-form constant (make-null-lexenv))
+ (sb!xc:make-load-form constant (make-null-lexenv))
(error (condition)
(error (condition)
- (compiler-error "(while making load form for ~S)~%~A"
- constant
- condition)))
+ (compiler-error 'make-load-form-error
+ :condition condition
+ :object constant)))
(case creation-form
(:sb-just-dump-it-normally
(fasl-validate-structure constant *compile-object*)
(case creation-form
(:sb-just-dump-it-normally
(fasl-validate-structure constant *compile-object*)