X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fdebug-dump.lisp;h=797114aec31fec0db97cc94ddd493885465af5ca;hb=a4882e3023fdd5e777169a4cbede33605281173c;hp=b0987970467186f84749b5b93dfacb87265418bc;hpb=c2431e2d0d0222a3cf20cfdfa48201bdcc65cd76;p=sbcl.git

diff --git a/src/compiler/debug-dump.lisp b/src/compiler/debug-dump.lisp
index b098797..797114a 100644
--- a/src/compiler/debug-dump.lisp
+++ b/src/compiler/debug-dump.lisp
@@ -255,21 +255,8 @@
        (setf (debug-source-from res) name
              (debug-source-name res) (file-info-forms file-info)))
       (pathname
-       (let* ((untruename (file-info-untruename file-info))
-              (dir (pathname-directory untruename)))
-         (setf (debug-source-name res)
-               #+sb-xc-host
-               (let ((src (position "src" dir :test #'string= :from-end t)))
-                 (if src
-                     (format nil "SYS:~{~:@(~A~);~}~:@(~A~).LISP"
-                             (subseq dir src) (pathname-name untruename))
-                     ;; FIXME: just output/stuff-groveled-from-headers.lisp
-                     (namestring untruename)))
-               #-sb-xc-host
-               (namestring
-                (if (and dir (eq (first dir) :absolute))
-                    untruename
-                    name))))))
+       (setf (debug-source-name res)
+             (make-file-info-namestring name file-info))))
     res))
 
 ;;; Given an arbitrary sequence, coerce it to an unsigned vector if
@@ -344,7 +331,7 @@
     (declare (type index flags))
     (when minimal
       (setq flags (logior flags compiled-debug-var-minimal-p))
-      (unless tn
+      (unless (and tn (tn-offset tn))
         (setq flags (logior flags compiled-debug-var-deleted-p))))
     (when (and (or (eq kind :environment)
                    (and (eq kind :debug-environment)
@@ -362,7 +349,7 @@
       (vector-push-extend name buffer)
       (unless (zerop id)
         (vector-push-extend id buffer)))
-    (if tn
+    (if (and tn (tn-offset tn))
         (vector-push-extend (tn-sc-offset tn) buffer)
         (aver minimal))
     (when save-tn
@@ -509,7 +496,7 @@
 (defun compute-1-debug-fun (fun var-locs)
   (declare (type clambda fun) (type hash-table var-locs))
   (let* ((dfun (dfun-from-fun fun))
-         (actual-level (policy (lambda-bind fun) debug))
+         (actual-level (policy (lambda-bind fun) compute-debug-fun))
          (level (if #!+sb-dyncount *collect-dynamic-statistics*
                     #!-sb-dyncount nil
                     (max actual-level 2)