1.0.17.20: NIL is a legal function name (regression 1.0.13.38)

[sbcl.git] / src / compiler / fopcompile.lisp

diff --git a/src/compiler/fopcompile.lisp b/src/compiler/fopcompile.lisp
index 3afa7af..1a33385 100644 (file)
--- 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