X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefboot.lisp;h=385402e291138a6b0cb51ff1859e89e3e96dab91;hb=f7faed97898dd0e94a18b0d1fca03aaa0fe24ab0;hp=c7113c4a48b3e593390916812bc78f9ee2f5c8ab;hpb=bbcefe4e494c15084211080537f3eca1b8b1f3f8;p=sbcl.git

diff --git a/src/code/defboot.lisp b/src/code/defboot.lisp
index c7113c4..385402e 100644
--- a/src/code/defboot.lisp
+++ b/src/code/defboot.lisp
@@ -229,6 +229,11 @@ evaluated as a PROGN."
           :new-function def
           :new-location source-location))
   (setf (sb!xc:fdefinition name) def)
+  ;; %COMPILER-DEFUN doesn't do this except at compile-time, when it
+  ;; also checks package locks. By doing this here we let (SETF
+  ;; FDEFINITION) do the load-time package lock checking before
+  ;; we frob any existing inline expansions.
+  (sb!c::%set-inline-expansion name nil inline-lambda)
 
   (sb!c::note-name-defined name :function)
 
@@ -443,7 +448,7 @@ evaluated as a PROGN."
 ;;; Wrap the RESTART-CASE expression in a WITH-CONDITION-RESTARTS if
 ;;; appropriate. Gross, but it's what the book seems to say...
 (defun munge-restart-case-expression (expression env)
-  (let ((exp (sb!xc:macroexpand expression env)))
+  (let ((exp (%macroexpand expression env)))
     (if (consp exp)
         (let* ((name (car exp))
                (args (if (eq name 'cerror) (cddr exp) (cdr exp))))