0.pre7.98:

[sbcl.git] / src / compiler / entry.lisp

diff --git a/src/compiler/entry.lisp b/src/compiler/entry.lisp
index bdb48e1..33ea6cc 100644 (file)
--- a/src/compiler/entry.lisp
+++ b/src/compiler/entry.lisp
@@ -54,14 +54,12 @@
 (defun compute-entry-info (fun info)
   (declare (type clambda fun) (type entry-info info))
   (let ((bind (lambda-bind fun))
-       (internal-fun (functional-entry-function fun)))
+       (internal-fun (functional-entry-fun fun)))
     (setf (entry-info-closure-p info)
          (not (null (physenv-closure (lambda-physenv fun)))))
     (setf (entry-info-offset info) (gen-label))
     (setf (entry-info-name info)
-         (let ((name (leaf-name internal-fun)))
-           (or name
-               (component-name (block-component (node-block bind))))))
+         (leaf-debug-name internal-fun))
     (when (policy bind (>= debug 1))
       (setf (entry-info-arguments info) (make-arg-names internal-fun))
       (setf (entry-info-type info) (type-specifier (leaf-type internal-fun)))))
@@ -89,11 +87,13 @@
       (case (functional-kind lambda)
        (:external
         (unless (lambda-has-external-references-p lambda)
-          (let* ((ef (functional-entry-function lambda))
-                 (new (make-functional :kind :toplevel-xep
-                                       :info (leaf-info lambda)
-                                       :name (leaf-name ef)
-                                       :lexenv (make-null-lexenv)))
+          (let* ((ef (functional-entry-fun lambda))
+                 (new (make-functional
+                       :kind :toplevel-xep
+                       :info (leaf-info lambda)
+                       :%source-name (functional-%source-name ef)
+                       :%debug-name (functional-%debug-name ef)
+                       :lexenv (make-null-lexenv)))
                  (closure (physenv-closure
                            (lambda-physenv (main-entry ef)))))
             (dolist (ref (leaf-refs lambda))