X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fassem.lisp;h=778eb41fdac6972dd1a6965cf46b616c57b1e6c3;hb=22c1de0a40df83bb5628974010a879cb2c17ff53;hp=575ecd89419ad37aed84828311bb58a74e843aa6;hpb=cf607a404d7518e8a18c9e362913f370eb9a5e38;p=sbcl.git

diff --git a/src/compiler/assem.lisp b/src/compiler/assem.lisp
index 575ecd8..778eb41 100644
--- a/src/compiler/assem.lisp
+++ b/src/compiler/assem.lisp
@@ -156,9 +156,7 @@
 ;;; BACK-PATCH-FUN so we can avoid this nastiness altogether.
 (defmacro with-modified-segment-index-and-posn ((segment index posn)
 						&body body)
-  (let ((n-segment (gensym "SEGMENT"))
-	(old-index (gensym "OLD-INDEX-"))
-	(old-posn (gensym "OLD-POSN-")))
+  (with-unique-names (n-segment old-index old-posn)
     `(let* ((,n-segment ,segment)
 	    (,old-index (segment-current-index ,n-segment))
 	    (,old-posn (segment-current-posn ,n-segment)))
@@ -1332,6 +1330,7 @@ p	    ;; the branch has two dependents and one of them dpends on
 ;;; calling FUNCTION once on the entire compacted segment buffer. --
 ;;; WHN 19990322
 (defun on-segment-contents-vectorly (segment function)
+  (declare (type function function))
   (let ((buffer (segment-buffer segment))
 	(i0 0))
     (flet ((frob (i0 i1)
@@ -1653,8 +1652,7 @@ p	    ;; the branch has two dependents and one of them dpends on
 		(append ,@(extract-nths 0 'list pdefs)))))))))
 
 (defmacro define-instruction-macro (name lambda-list &body body)
-  (let ((whole (gensym "WHOLE-"))
-	(env (gensym "ENV-")))
+  (with-unique-names (whole env)
     (multiple-value-bind (body local-defs)
 	(sb!kernel:parse-defmacro lambda-list
 				  whole