X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fmain.lisp;h=6d1d03c21f04eccbdc3350d789216728ef0c8533;hb=40f6a8f39da1faba169a081dfd3aeb7ad8391f55;hp=eae1bd600dcb4052c8d64b09550afde55decb813;hpb=a80a02aec71e15e1ae7bebd502399ab2b824d08b;p=sbcl.git

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index eae1bd6..6d1d03c 100644
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -706,12 +706,14 @@ Examples:
 (defun clear-constant-info ()
   (maphash (lambda (k v)
              (declare (ignore k))
-             (setf (leaf-info v) nil))
+             (setf (leaf-info v) nil)
+             (setf (constant-boxed-tn v) nil))
            *constants*)
   (maphash (lambda (k v)
              (declare (ignore k))
              (when (constant-p v)
-               (setf (leaf-info v) nil)))
+               (setf (leaf-info v) nil)
+               (setf (constant-boxed-tn v) nil)))
            *free-vars*)
   (values))
 
@@ -1014,7 +1016,7 @@ Examples:
 ;;; We only expand one level, so that we retain all the intervening
 ;;; forms in the source path.
 (defun preprocessor-macroexpand-1 (form)
-  (handler-case (sb!xc:macroexpand-1 form *lexenv*)
+  (handler-case (%macroexpand-1 form *lexenv*)
     (error (condition)
       (compiler-error "(during macroexpansion of ~A)~%~A"
                       (let ((*print-level* 2)