X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fmain.lisp;h=41c49a175416c3358c9a402ae8dd5426df6a2b99;hb=65a01dae3d437a48e8dd0d051a446245f9e29929;hp=01bca3ad44fd738bad09fe250e92ba05a42d9265;hpb=6498af7fdc48d9bf5df33e75d7e4d385893feb06;p=sbcl.git

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index 01bca3a..41c49a1 100644
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -87,6 +87,11 @@
 ;;; normally causes nested uses to be no-ops).
 (defvar *in-compilation-unit* nil)
 
+;;; This lock is siezed in the same situation: the compiler is not
+;;; presently thread-safe
+(defvar *big-compiler-lock*
+  (sb!thread:make-mutex :name "big compiler lock"))
+
 ;;; Count of the number of compilation units dynamically enclosed by
 ;;; the current active WITH-COMPILATION-UNIT that were unwound out of.
 (defvar *aborted-compilation-unit-count*)
@@ -121,12 +126,13 @@
   `(%with-compilation-unit (lambda () ,@body) ,@options))
 
 (defun %with-compilation-unit (fn &key override)
+  (declare (type function fn))
   (let ((succeeded-p nil))
     (if (and *in-compilation-unit* (not override))
 	;; Inside another WITH-COMPILATION-UNIT, a WITH-COMPILATION-UNIT is
 	;; ordinarily (unless OVERRIDE) basically a no-op.
 	(unwind-protect
-	    (multiple-value-prog1 (funcall fn) (setf succeeded-p t))
+	     (multiple-value-prog1 (funcall fn) (setf succeeded-p t))
 	  (unless succeeded-p
 	    (incf *aborted-compilation-unit-count*)))
 	;; FIXME: Now *COMPILER-FOO-COUNT* stuff is bound in more than
@@ -139,16 +145,17 @@
 	      (*compiler-note-count* 0)
 	      (*undefined-warnings* nil)
 	      (*in-compilation-unit* t))
-	  (handler-bind ((parse-unknown-type
-			  (lambda (c)
-			    (note-undefined-reference
-			     (parse-unknown-type-specifier c)
-			     :type))))
-	    (unwind-protect
-		(multiple-value-prog1 (funcall fn) (setf succeeded-p t))
-	      (unless succeeded-p
-		(incf *aborted-compilation-unit-count*))
-	      (summarize-compilation-unit (not succeeded-p))))))))
+	  (sb!thread:with-recursive-lock (*big-compiler-lock*)
+	    (handler-bind ((parse-unknown-type
+			    (lambda (c)
+			      (note-undefined-reference
+			       (parse-unknown-type-specifier c)
+			       :type))))
+	      (unwind-protect
+		   (multiple-value-prog1 (funcall fn) (setf succeeded-p t))
+		(unless succeeded-p
+		  (incf *aborted-compilation-unit-count*))
+		(summarize-compilation-unit (not succeeded-p)))))))))
 
 ;;; This is to be called at the end of a compilation unit. It signals
 ;;; any residual warnings about unknown stuff, then prints the total
@@ -870,10 +877,14 @@
     (setf (component-name component)
 	  (debug-namify "~S initial component" name))
     (setf (component-kind component) :initial)
-    (let* ((locall-fun (ir1-convert-lambda
+    (let* ((locall-fun (ir1-convert-lambdalike
                         definition
                         :debug-name (debug-namify "top level local call ~S"
-                                                  name)))
+                                                  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))
            (fun (ir1-convert-lambda (make-xep-lambda-expression locall-fun)
 				    :source-name (or name '.anonymous.)
 				    :debug-name (unless name