0.7.7.24:

[sbcl.git] / src / compiler / target-main.lisp

diff --git a/src/compiler/target-main.lisp b/src/compiler/target-main.lisp
index f9b6c70..23bfb23 100644 (file)
--- a/src/compiler/target-main.lisp
+++ b/src/compiler/target-main.lisp
@@ -50,10 +50,10 @@
             (*toplevel-lambdas* ())
             (*block-compile* nil)
             (*compiler-error-bailout*
-             #'(lambda ()
-                 (compiler-mumble
-                  "~2&fatal error, aborting compilation~%")
-                 (return-from actually-compile (values nil t nil))))
+             (lambda ()
+               (compiler-mumble
+                "~2&fatal error, aborting compilation~%")
+               (return-from actually-compile (values nil t nil))))
             (*current-path* nil)
             (*last-source-context* nil)
             (*last-original-source* nil)
@@ -76,7 +76,8 @@
                  :name name
                  :path '(original-source-start 0 0))))))
 
-(defun compile (name &optional (definition (fdefinition name)))
+(defun compile (name &optional (definition (or (macro-function name)
+                                              (fdefinition name))))
   #!+sb-doc
   "Coerce DEFINITION (by default, the function whose name is NAME)
   to a compiled function, returning (VALUES THING WARNINGS-P FAILURE-P),
@@ -89,7 +90,8 @@
          (values definition nil nil)
          (actually-compile name definition))
     (cond (name
-          (if (macro-function name)
+          (if (and (symbolp name)
+                    (macro-function name))
               (setf (macro-function name) compiled-definition)
               (setf (fdefinition name) compiled-definition))
           (values name warnings-p failure-p))