X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fmain.lisp;h=83c67e34e64b20ddcdbc651dcd105b020306c166;hb=fea8ea02847ddc0864546a02480fb3e97d6fa318;hp=ff1bcce79cb3ee8c64c5fa6773acbb1fc4885534;hpb=0332a8dfdfffccb839cd55ddb682c2d03785b376;p=sbcl.git

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index ff1bcce..83c67e3 100644
--- 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*
-	    (lambda ()
+	    (lambda (&optional condition)
 	      (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))))
 
@@ -1695,11 +1693,11 @@
 	(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)
-		 (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*)