X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1-translators.lisp;h=d9545758a3ee251f39753c02ebcec66852e7ff00;hb=75b52379bdc2269961af6a1308eca63610f38ac3;hp=fc91bee8dbfdc4b69d3d1dbf88784b2ef64a777e;hpb=ff92598854bf7cae8d57fe49cef4d9a98e1ab345;p=sbcl.git

diff --git a/src/compiler/ir1-translators.lisp b/src/compiler/ir1-translators.lisp
index fc91bee..d954575 100644
--- a/src/compiler/ir1-translators.lisp
+++ b/src/compiler/ir1-translators.lisp
@@ -281,8 +281,8 @@
         (unless (symbolp name)
           (fail "The local macro name ~S is not a symbol." name))
 	(when (fboundp name)
-	  (with-single-package-locked-error
-	      (:symbol name "binding ~A as a local macro")))
+	  (compiler-assert-symbol-home-package-unlocked
+           name "binding ~A as a local macro"))
         (unless (listp arglist)
           (fail "The local macro argument list ~S is not a list."
                 arglist))
@@ -332,8 +332,8 @@
         (unless (symbolp name)
           (fail "The local symbol macro name ~S is not a symbol." name))
 	(when (or (boundp name) (eq (info :variable :kind name) :macro))
-	  (with-single-package-locked-error
-	      (:symbol name "binding ~A as a local symbol-macro")))
+	  (compiler-assert-symbol-home-package-unlocked
+           name "binding ~A as a local symbol-macro"))
         (let ((kind (info :variable :kind name)))
           (when (member kind '(:special :constant))
             (fail "Attempt to bind a ~(~A~) variable with SYMBOL-MACROLET: ~S"
@@ -534,8 +534,8 @@
 		 (vals (second spec)))))))
     (dolist (name (names))
       (when (eq (info :variable :kind name) :macro)
-	(with-single-package-locked-error
-	    (:symbol name "lexically binding symbol-macro ~A"))))
+	(compiler-assert-symbol-home-package-unlocked
+         name "lexically binding symbol-macro ~A")))
     (values (vars) (vals))))
 
 (def-ir1-translator let ((bindings &body body) start next result)
@@ -620,8 +620,8 @@
       (let ((name (first def)))
 	(check-fun-name name)
 	(when (fboundp name)
-	  (with-single-package-locked-error
-	      (:symbol name "binding ~A as a local function")))
+	  (compiler-assert-symbol-home-package-unlocked
+           name "binding ~A as a local function"))
 	(names name)
 	(multiple-value-bind (forms decls) (parse-body (cddr def))
 	  (defs `(lambda ,(second def)