X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmain.lisp;h=01d9c6ff7245ed461741f873aba07dd9918bca3d;hb=f705c517d8606a9a72edd11a96725f9c4e4be93d;hp=77daf4dbf56a9a81cd22c574667a5f3ddcba2f46;hpb=8902b8b6bd2e9285749dd39d313b33b6c69c5213;p=sbcl.git

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index 77daf4d..01d9c6f 100644
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -28,7 +28,8 @@
 		  #!+sb-show *compiler-trace-output*
 		  *last-source-context* *last-original-source*
 		  *last-source-form* *last-format-string* *last-format-args*
-		  *last-message-count* *lexenv* *fun-names-in-this-file*))
+		  *last-message-count* *lexenv* *fun-names-in-this-file*
+                  *allow-instrumenting*))
 
 ;;; Whether call of a function which cannot be defined causes a full
 ;;; warning.
@@ -196,7 +197,7 @@
 		    (t
 		     (compiler-warn
 		      "~@<The ~(~A~) ~S is undefined, and its name is ~
-                       reserved by ANSI CL so that even if it it were ~
+                       reserved by ANSI CL so that even if it were ~
                        defined later, the code doing so would not be ~
                        portable.~:@>"
 		      kind name)))
@@ -914,14 +915,11 @@
     (setf (component-name component)
 	  (debug-namify "~S initial component" name))
     (setf (component-kind component) :initial)
-    (let* ((locall-fun (ir1-convert-lambdalike
-                        definition
-                        :debug-name (debug-namify "top level local call "
-						  name)
-			;; KLUDGE: we do this so that we get to have
-			;; nice debug returnness in functions defined
-			;; from the REPL
-			:allow-debug-catch-tag t))
+    (let* ((locall-fun (let ((*allow-instrumenting* t))
+                         (ir1-convert-lambdalike
+                          definition
+                          :debug-name (debug-namify "top level local call "
+                                                    name))))
            (fun (ir1-convert-lambda (make-xep-lambda-expression locall-fun)
 				    :source-name (or name '.anonymous.)
 				    :debug-name (unless name
@@ -955,7 +953,8 @@
 		  '(original-source-start 0 0)))
   (when name
     (legal-fun-name-or-type-error name))
-  (let* ((*lexenv* (make-lexenv :policy *policy*
+  (let* (
+         (*lexenv* (make-lexenv :policy *policy*
 				:handled-conditions *handled-conditions*
 				:disabled-package-locks *disabled-package-locks*))
          (fun (make-functional-from-toplevel-lambda lambda-expression
@@ -1403,6 +1402,7 @@
         (*source-info* info)
         (*toplevel-lambdas* ())
         (*fun-names-in-this-file* ())
+        (*allow-instrumenting* nil)
         (*compiler-error-bailout*
          (lambda ()
            (compiler-mumble "~2&; fatal error, aborting compilation~%")