X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fglobaldb.lisp;h=8a7a6ef6495ffbb51b93f18ce652c6e038f0428d;hb=77c80b85dc9ae9bde0692d4193187bfca507b936;hp=242445e85d180ed5a1faa7766d3661b229c5a9e8;hpb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;p=sbcl.git

diff --git a/src/compiler/globaldb.lisp b/src/compiler/globaldb.lisp
index 242445e..8a7a6ef 100644
--- a/src/compiler/globaldb.lisp
+++ b/src/compiler/globaldb.lisp
@@ -360,7 +360,7 @@
 	     ,(do-compact-info name class type type-number value
 			       n-env body)))))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
+(eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute)
 
 ;;; Return code to iterate over a compact info environment.
 (defun do-compact-info (name-var class-var type-var type-number-var value-var
@@ -819,15 +819,14 @@
   ;; Constant CLASS and TYPE is an overwhelmingly common special case,
   ;; and we can implement it much more efficiently than the general case.
   (if (and (constantp class) (constantp type))
-      (let ((info (type-info-or-lose class type))
-	    (value (gensym "VALUE"))
-	    (foundp (gensym "FOUNDP")))
-	`(multiple-value-bind (,value ,foundp)
-	     (get-info-value ,name
-			     ,(type-info-number info)
-			     ,@(when env-list-p `(,env-list))) 
-	   (declare (type ,(type-info-type info) ,value))
-	   (values ,value ,foundp)))
+      (let ((info (type-info-or-lose class type)))
+	(with-unique-names (value foundp)
+	  `(multiple-value-bind (,value ,foundp)
+	       (get-info-value ,name
+			       ,(type-info-number info)
+			       ,@(when env-list-p `(,env-list))) 
+	     (declare (type ,(type-info-type info) ,value))
+	     (values ,value ,foundp))))
       whole))
 (defun (setf info) (new-value
 		    class