X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fxref.lisp;h=4bf2fd08582705a748eff9f5c6bea4bf915c6e77;hb=95591ed483dbb8c0846c129953acac1554f28809;hp=a358784cee98bb37324d63069bee6d10974458e6;hpb=16062fad470533e429a12ac9cd0b9e53aa0e1e90;p=sbcl.git

diff --git a/src/compiler/xref.lisp b/src/compiler/xref.lisp
index a358784..4bf2fd0 100644
--- a/src/compiler/xref.lisp
+++ b/src/compiler/xref.lisp
@@ -101,20 +101,10 @@
                (record-xref :calls name context node nil)))))
          ;; Inlined global function
          (clambda
-          (when (functional-inlinep leaf)
-            (let ((name (leaf-debug-name leaf)))
-              ;; FIXME: we should store the original var into the
-              ;; functional when creating inlined-functionals, so that
-              ;; we could just check whether it was a global-var,
-              ;; rather then needing to guess based on the debug-name.
-              (when (or (symbolp name)
-                        ;; Any non-SETF non-symbol names will
-                        ;; currently be either non-functions or
-                        ;; internals.
-                        (and (consp name)
-                             (equal (car name) 'setf)))
-                ;; TODO: a WHO-INLINES xref-kind could be useful
-                (record-xref :calls name context node nil)))))
+          (let ((inline-var (functional-inline-expanded leaf)))
+            (when (global-var-p inline-var)
+              ;; TODO: a WHO-INLINES xref-kind could be useful
+              (record-xref :calls (leaf-debug-name inline-var) context node nil))))
          ;; Reading a constant
          (constant
           (record-xref :references (ref-%source-name node) context node nil)))))