diff --git a/compiler/ir1tran.lisp b/compiler/ir1tran.lisp index 0d8d36075598b64b7b480a69b8e11d5d8c82d8f6..1d7ecdc37b08d8c5bf86c4463c063e710d90a071 100644 --- a/compiler/ir1tran.lisp +++ b/compiler/ir1tran.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir1tran.lisp,v 1.129 2002/08/09 21:26:48 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir1tran.lisp,v 1.130 2002/08/12 16:08:13 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -348,8 +348,9 @@ (defmacro ir1-error-bailout ((start cont form &optional - (proxy ``(error "Execution of a form compiled with errors:~% ~S" - ',,form))) + (proxy ``(error 'simple-program-error + :format-control "Execution of a form compiled with errors:~% ~S" + :format-arguments (list ',,form)))) &body body) (let ((skip (gensym))) `(block ,skip diff --git a/compiler/main.lisp b/compiler/main.lisp index a8118cc3a9f3e638ec1b3f56b345889990329710..25d4d228a1d254b7529a57b11f5d394a1cf8e2f6 100644 --- a/compiler/main.lisp +++ b/compiler/main.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/main.lisp,v 1.125 2002/08/09 21:21:15 toy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/main.lisp,v 1.126 2002/08/12 16:08:14 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1082,8 +1082,9 @@ (*compiler-error-bailout* #'(lambda () (convert-and-maybe-compile - `(error "Execution of a form compiled with errors:~% ~S" - ',form) + `(error 'simple-program-error + :format-control "Execution of a form compiled with errors:~% ~S" + :format-arguments (list ',form)) path) (throw 'process-form-error-abort nil)))) (if (atom form)