X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ffopcompile.lisp;h=1a3338593c7a07e608de595f200ce955e345509d;hb=2f8c59edcd41f03c5daebeaf87518b5071a19826;hp=3afa7afbc0f52fa57d3b6af7bd81cd1ef9f93993;hpb=8f8966edb633dabfcde5d149c3e3a7fad26b7ff2;p=sbcl.git

diff --git a/src/compiler/fopcompile.lisp b/src/compiler/fopcompile.lisp
index 3afa7af..1a33385 100644
--- a/src/compiler/fopcompile.lisp
+++ b/src/compiler/fopcompile.lisp
@@ -266,7 +266,7 @@
          (fopcompile-constant form for-value-p))
         ((symbolp form)
          (multiple-value-bind (macroexpansion macroexpanded-p)
-             (macroexpand form *lexenv*)
+             (sb!xc:macroexpand form *lexenv*)
            (if macroexpanded-p
                ;; Symbol macro
                (fopcompile macroexpansion path for-value-p)
@@ -292,7 +292,7 @@
                                            for-value-p))))))))))
         ((listp form)
          (multiple-value-bind (macroexpansion macroexpanded-p)
-             (macroexpand form *lexenv*)
+             (sb!xc:macroexpand form *lexenv*)
            (if macroexpanded-p
                (fopcompile macroexpansion path for-value-p)
                (destructuring-bind (operator &rest args) form
@@ -321,7 +321,7 @@
                                     for-value-p)))
                    ((if)
                     (fopcompile-if args path for-value-p))
-                   ((progn)
+                   ((progn locally)
                     (loop for (arg . next) on args
                           do (fopcompile arg
                                          path (if next