0.6.11.10:

[sbcl.git] / src / compiler / debug-dump.lisp

diff --git a/src/compiler/debug-dump.lisp b/src/compiler/debug-dump.lisp
index e36ec9b..60169da 100644 (file)
--- a/src/compiler/debug-dump.lisp
+++ b/src/compiler/debug-dump.lisp
@@ -25,7 +25,8 @@
 ;;; The LOCATION-INFO structure holds the information what we need
 ;;; about locations which code generation decided were "interesting".
 (defstruct (location-info
-           (:constructor make-location-info (kind label vop)))
+           (:constructor make-location-info (kind label vop))
+           (:copier nil))
   ;; The kind of location noted.
   (kind nil :type location-kind)
   ;; The label pointing to the interesting code location.
@@ -247,7 +248,6 @@
   (mapcar #'(lambda (x)
              (let ((res (make-debug-source
                          :from :file
-                         :comment (file-info-comment x)
                          :created (file-info-write-date x)
                          :compiled (source-info-start-time info)
                          :source-root (file-info-source-root x)
@@ -499,8 +499,7 @@
 (defun compute-1-debug-function (fun var-locs)
   (declare (type clambda fun) (type hash-table var-locs))
   (let* ((dfun (dfun-from-fun fun))
-        (actual-level
-         (cookie-debug (lexenv-cookie (node-lexenv (lambda-bind fun)))))
+        (actual-level (policy (lambda-bind fun) debug))
         (level (if #!+sb-dyncount *collect-dynamic-statistics*
                    #!-sb-dyncount nil
                    (max actual-level 2)
@@ -564,7 +563,7 @@
                 minimal-debug-function-name-component)
                ((not pkg)
                 minimal-debug-function-name-uninterned)
-               ((eq pkg *package*)
+               ((eq pkg (sane-package))
                 minimal-debug-function-name-symbol)
                (t
                 minimal-debug-function-name-packaged))))