X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmain.lisp;h=137f74dcbe3e583725f316bec927833a9340197e;hb=c0595e94aab165f59454a3a97f06a8bdc22f5bd3;hp=9c8597a350c5a941f12f671d247ce16cb906bfa4;hpb=c41cb4c87eae7b04f844dca5f7edb5086c5d2d68;p=sbcl.git

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index 9c8597a..137f74d 100644
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -442,7 +442,7 @@
 	    (describe-ir2-component component *compiler-trace-output*))
 
 	  (maybe-mumble "code ")
-	  (multiple-value-bind (code-length trace-table fixups)
+	  (multiple-value-bind (code-length trace-table fixup-notes)
 	      (generate-code component)
 
             #-sb-xc-host
@@ -459,7 +459,7 @@
 				    *code-segment*
 				    code-length
 				    trace-table
-				    fixups
+				    fixup-notes
 				    *compile-object*))
 	      (core-object
 	       (maybe-mumble "core")
@@ -467,7 +467,7 @@
 				    *code-segment*
 				    code-length
 				    trace-table
-				    fixups
+				    fixup-notes
 				    *compile-object*))
 	      (null))))))
 
@@ -1342,33 +1342,35 @@
 ;;; Return (VALUES NIL WARNINGS-P FAILURE-P).
 (defun sub-compile-file (info)
   (declare (type source-info info))
-  (let* ((*block-compile* *block-compile-arg*)
-	 (*package* (sane-package))
-	 (*policy* *policy*)
-	 (*lexenv* (make-null-lexenv))
-	 (*source-info* info)
-	 (sb!xc:*compile-file-pathname* nil)
-	 (sb!xc:*compile-file-truename* nil)
-	 (*toplevel-lambdas* ())
-	 (*fun-names-in-this-file* ())
-	 (*compiler-error-bailout*
-	  (lambda ()
-	    (compiler-mumble "~2&; fatal error, aborting compilation~%")
-	    (return-from sub-compile-file (values nil t t))))
-	 (*current-path* nil)
-	 (*last-source-context* nil)
-	 (*last-original-source* nil)
-	 (*last-source-form* nil)
-	 (*last-format-string* nil)
-	 (*last-format-args* nil)
-	 (*last-message-count* 0)
-	 ;; FIXME: Do we need this rebinding here? It's a literal
-	 ;; translation of the old CMU CL rebinding to
-	 ;; (OR *BACKEND-INFO-ENVIRONMENT* *INFO-ENVIRONMENT*),
-	 ;; and it's not obvious whether the rebinding to itself is
-	 ;; needed that SBCL doesn't need *BACKEND-INFO-ENVIRONMENT*.
-	 (*info-environment* *info-environment*)
-	 (*gensym-counter* 0))
+  (let ((*package* (sane-package))
+        (*readtable* *readtable*)
+        (sb!xc:*compile-file-pathname* nil) ; really bound in
+        (sb!xc:*compile-file-truename* nil) ; SUB-SUB-COMPILE-FILE
+
+        (*policy* *policy*)
+        (*lexenv* (make-null-lexenv))
+        (*block-compile* *block-compile-arg*)
+        (*source-info* info)
+        (*toplevel-lambdas* ())
+        (*fun-names-in-this-file* ())
+        (*compiler-error-bailout*
+         (lambda ()
+           (compiler-mumble "~2&; fatal error, aborting compilation~%")
+           (return-from sub-compile-file (values nil t t))))
+        (*current-path* nil)
+        (*last-source-context* nil)
+        (*last-original-source* nil)
+        (*last-source-form* nil)
+        (*last-format-string* nil)
+        (*last-format-args* nil)
+        (*last-message-count* 0)
+        ;; FIXME: Do we need this rebinding here? It's a literal
+        ;; translation of the old CMU CL rebinding to
+        ;; (OR *BACKEND-INFO-ENVIRONMENT* *INFO-ENVIRONMENT*),
+        ;; and it's not obvious whether the rebinding to itself is
+        ;; needed that SBCL doesn't need *BACKEND-INFO-ENVIRONMENT*.
+        (*info-environment* *info-environment*)
+        (*gensym-counter* 0))
     (handler-case
 	(with-compilation-values
 	 (sb!xc:with-compilation-unit ()