X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Flocall.lisp;h=18d051b0086056deaa550c1da7b68010301c4c7d;hb=883b33b092472473b0dd559d64351b9436916af3;hp=e5bbc97317b5a812f4dba2c3c186c35056e89071;hpb=e39c00f137e71016e259c667dfe2aa628963b730;p=sbcl.git

diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp
index e5bbc97..18d051b 100644
--- a/src/compiler/locall.lisp
+++ b/src/compiler/locall.lisp
@@ -233,8 +233,8 @@
 	    (leaf-ever-used res) t
 	    (functional-entry-fun res) fun
 	    (functional-entry-fun fun) res
-	    (component-reanalyze *current-component*) t
-	    (component-reoptimize *current-component*) t)
+	    (component-reanalyze *current-component*) t)
+      (reoptimize-component *current-component* :maybe)
       (etypecase fun
 	(clambda
 	 (locall-analyze-fun-1 fun))
@@ -378,7 +378,7 @@
 	   (inline-expansion-ok call))
       (let* ((end (component-last-block (node-component call)))
              (pred (block-prev end)))
-        (multiple-value-bind (losing-local-functional converted-lambda)
+        (multiple-value-bind (losing-local-object converted-lambda)
             (catch 'locall-already-let-converted
               (with-ir1-environment-from-node call
                 (let ((*lexenv* (functional-lexenv original-functional)))
@@ -389,12 +389,18 @@
                                         "local inline "
                                         (leaf-debug-name
                                          original-functional)))))))
-          (cond (losing-local-functional
-                 (let ((*compiler-error-context* call))
-                   (compiler-notify "couldn't inline expand because expansion ~
-		                   calls this LET-converted local function:~
-		                   ~%  ~S"
-                                    (leaf-debug-name losing-local-functional)))
+          (cond (losing-local-object
+                 (if (functional-p losing-local-object)
+                     (let ((*compiler-error-context* call))
+                       (compiler-notify "couldn't inline expand because expansion ~
+                                         calls this LET-converted local function:~
+                                         ~%  ~S"
+                                        (leaf-debug-name losing-local-object)))
+                     (let ((*compiler-error-context* call))
+                       (compiler-notify "implementation limitation: couldn't inline ~
+                                         expand because expansion refers to ~
+                                         the optimized away object ~S."
+                                        losing-local-object)))
                  (loop for block = (block-next pred) then (block-next block)
                        until (eq block end)
                        do (setf (block-delete-p block) t))
@@ -627,8 +633,7 @@
       (when (optional-dispatch-keyp fun)
 	(when (oddp (length more))
 	  (compiler-warn "function called with odd number of ~
-  		          arguments in keyword portion")
-
+                          arguments in keyword portion")
 	  (setf (basic-combination-kind call) :error)
 	  (return-from convert-more-call))