X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fentry.lisp;h=d2ace4c7b2cdd42ce889132e4e9ad02d6ce4f28b;hb=4ba392170e98744f0ef0b8e08a5d42b988f1d0c9;hp=33ea6cc6ec98ef992cf084ae9452a20927f24fac;hpb=20748f2dd7965dcd1446a1cb27e5a5af18a0e5bb;p=sbcl.git

diff --git a/src/compiler/entry.lisp b/src/compiler/entry.lisp
index 33ea6cc..d2ace4c 100644
--- a/src/compiler/entry.lisp
+++ b/src/compiler/entry.lisp
@@ -23,45 +23,40 @@
 (defun entry-analyze (component)
   (let ((2comp (component-info component)))
     (dolist (fun (component-lambdas component))
-      (when (external-entry-point-p fun)
-	(let ((info (or (leaf-info fun)
-			(setf (leaf-info fun) (make-entry-info)))))
-	  (compute-entry-info fun info)
-	  (push info (ir2-component-entries 2comp))))))
-
+      (when (xep-p fun)
+        (let ((info (or (leaf-info fun)
+                        (setf (leaf-info fun) (make-entry-info)))))
+          (compute-entry-info fun info)
+          (push info (ir2-component-entries 2comp))))))
   (select-component-format component)
   (values))
 
-;;; Takes the list representation of the debug arglist and turns it
-;;; into a string.
-;;;
-;;; FIXME: Why don't we just save this as a list instead of converting
-;;; it to a string?
-(defun make-arg-names (x)
-  (declare (type functional x))
-  (let ((args (functional-arg-documentation x)))
-    (aver (not (eq args :unspecified)))
-    (if (null args)
-	"()"
-	(let ((*print-pretty* t)
-	      (*print-escape* t)
-	      (*print-base* 10)
-	      (*print-radix* nil)
-	      (*print-case* :downcase))
-	  (write-to-string args)))))
-
 ;;; Initialize INFO structure to correspond to the XEP LAMBDA FUN.
 (defun compute-entry-info (fun info)
   (declare (type clambda fun) (type entry-info info))
   (let ((bind (lambda-bind fun))
-	(internal-fun (functional-entry-fun fun)))
-    (setf (entry-info-closure-p info)
-	  (not (null (physenv-closure (lambda-physenv fun)))))
+        (internal-fun (functional-entry-fun fun)))
+    (setf (entry-info-closure-tn info)
+          (if (physenv-closure (lambda-physenv fun))
+              (make-normal-tn *backend-t-primitive-type*)
+              nil))
     (setf (entry-info-offset info) (gen-label))
     (setf (entry-info-name info)
-	  (leaf-debug-name internal-fun))
+          (leaf-debug-name internal-fun))
+    (let ((doc (functional-documentation internal-fun))
+          (xrefs (pack-xref-data (functional-xref internal-fun))))
+      (setf (entry-info-info info) (if (and doc xrefs)
+                                       (cons doc xrefs)
+                                       (or doc xrefs))))
     (when (policy bind (>= debug 1))
-      (setf (entry-info-arguments info) (make-arg-names internal-fun))
+      (let ((args (functional-arg-documentation internal-fun)))
+        (aver (not (eq args :unspecified)))
+        ;; When the component is dumped, the arglists of the entry
+        ;; points will be dumped.  If they contain values that need
+        ;; make-load-form processing then we need to do it now (bug
+        ;; 310132).
+        (setf (entry-info-arguments info)
+              (constant-value (find-constant args))))
       (setf (entry-info-type info) (type-specifier (leaf-type internal-fun)))))
   (values))
 
@@ -85,26 +80,28 @@
   (let ((res nil))
     (dolist (lambda (component-lambdas component))
       (case (functional-kind lambda)
-	(:external
-	 (unless (lambda-has-external-references-p lambda)
-	   (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))
-	       (let ((ref-component (block-component (node-block ref))))
-		 (cond ((eq ref-component component))
-		       ((or (not (component-toplevelish-p ref-component))
-			    closure)
-			(setq res t))
-		       (t
-			(setf (ref-leaf ref) new)
-			(push ref (leaf-refs new)))))))))
-	(:toplevel
-	 (setq res t))))
+        (:external
+         (unless (lambda-has-external-references-p lambda)
+           (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))
+               (let ((ref-component (node-component ref)))
+                 (cond ((eq ref-component component))
+                       ((or (not (component-toplevelish-p ref-component))
+                            closure)
+                        (setq res t))
+                       (t
+                        (setf (ref-leaf ref) new)
+                        (push ref (leaf-refs new))
+                        (setf (leaf-refs lambda)
+                              (delq ref (leaf-refs lambda))))))))))
+        (:toplevel
+         (setq res t))))
     res))