X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdefboot.lisp;h=2285b4f6e704e74d3d0152dd9b0fb98475f27cf1;hb=c712f88b26cd7547ee984b90e18c134401335bc3;hp=778a7ab60395fd81dcd94c0948a41fa9d9979659;hpb=b04168702f7617b988ea032718b1254ed3ef5ccb;p=sbcl.git diff --git a/src/code/defboot.lisp b/src/code/defboot.lisp index 778a7ab..2285b4f 100644 --- a/src/code/defboot.lisp +++ b/src/code/defboot.lisp @@ -152,7 +152,8 @@ evaluated as a PROGN." (defun inline-fun-name-p (name) (or ;; the normal reason for saving the inline expansion - (info :function :inlinep name) + (let ((inlinep (info :function :inlinep name))) + (member inlinep '(:inline :maybe-inline))) ;; another reason for saving the inline expansion: If the ;; ANSI-recommended idiom ;; (DECLAIM (INLINE FOO)) @@ -181,10 +182,8 @@ evaluated as a PROGN." (lambda `(lambda ,@lambda-guts)) #-sb-xc-host (named-lambda `(named-lambda ,name ,@lambda-guts)) - (inline-type (inline-fun-name-p name)) (inline-lambda - (when (and inline-type - (neq inline-type :notinline)) + (when (inline-fun-name-p name) ;; we want to attempt to inline, so complain if we can't (or (sb!c:maybe-inline-syntactic-closure lambda env) (progn