X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-misc.lisp;h=0f65c71acc8690b70627a28a1c0fa6693a589261;hb=aab81dccfb1a311eac523a855004a3669340aca6;hp=cd4c4a816aae0a4273502407f2b00a9825256c15;hpb=970dd272dc84f7420252eadb4829cc193f795716;p=sbcl.git

diff --git a/src/code/target-misc.lisp b/src/code/target-misc.lisp
index cd4c4a8..0f65c71 100644
--- a/src/code/target-misc.lisp
+++ b/src/code/target-misc.lisp
@@ -17,6 +17,13 @@
 ;;;; function names and documentation
 
 ;;;; the ANSI interface to function names (and to other stuff too)
+;;; Note: this function gets called by the compiler (as of 1.0.17.x,
+;;; in MAYBE-INLINE-SYNTACTIC-CLOSURE), and so although ANSI says
+;;; we're allowed to return NIL here freely, it seems plausible that
+;;; small changes to the circumstances under which this function
+;;; returns non-NIL might have subtle consequences on the compiler.
+;;; So it might be desirable to have the compiler not rely on this
+;;; function, eventually.
 (defun function-lambda-expression (fun)
   "Return (VALUES DEFINING-LAMBDA-EXPRESSION CLOSURE-P NAME), where
   DEFINING-LAMBDA-EXPRESSION is NIL if unknown, or a suitable argument
@@ -33,15 +40,15 @@
        (values `(lambda ,lambda-list ,@body)
                t name)))
     (function
-     (let* ((fun (%simple-fun-self fun))
+     (let* ((fun (%simple-fun-self (%fun-fun fun)))
             (name (%fun-name fun))
             (code (sb!di::fun-code-header fun))
             (info (sb!kernel:%code-debug-info code)))
        (if info
            (let ((source (sb!c::debug-info-source info)))
-             (cond ((and (eq (sb!c::debug-source-from source) :lisp)
+             (cond ((and (sb!c::debug-source-form source)
                          (eq (sb!c::debug-source-function source) fun))
-                    (values (svref (sb!c::debug-source-name source) 0)
+                    (values (sb!c::debug-source-form source)
                             nil
                             name))
                    ((legal-fun-name-p name)
@@ -138,7 +145,7 @@
 (defun machine-instance ()
   #!+sb-doc
   "Return a string giving the name of the local machine."
-  #!+win32 "some-random-windows-box"
+  #!+win32 (sb!win32::get-computer-name)
   #!-win32 (sb!unix:unix-gethostname))
 
 (defvar *machine-version*)