1.0.27.35: minimize the potential for presenting hosts with choices

By having minimal debug names for toplevel forms and component names, we
avoid having arbitrary gensyms or, horror of horror, QUOTE: which is
printed differently in different implementations...

2 commit messages follow:

minimal debug names for cross-compiled top-level forms

Otherwise we run the risk of getting arbitrary gensyms dumped as part of
the debug name.

bandage for ' vs QUOTE in two files

Make FIND-COMPONENT-NAME in the XC (which names components, whose names
are dumped in xc fasls) use only the first symbol in the context.  That
will be generally lame but avoids any current instances of QUOTE, which
prints differently in different implementations when pretty-printing is
off.

diff --git a/src/compiler/ir1report.lisp b/src/compiler/ir1report.lisp
index 14a2121..e2ec713 100644 (file)
--- a/src/compiler/ir1report.lisp
+++ b/src/compiler/ir1report.lisp
@@ -432,12 +432,13 @@ has written, having proved that it is unreachable."))
   (let ((ep (first (block-succ (component-head component)))))
     (aver ep) ; else no entry points??
     (multiple-value-bind (form context)
-        (find-original-source
-         (node-source-path (block-start-node ep)))
+        (find-original-source (node-source-path (block-start-node ep)))
       (declare (ignore form))
       (let ((*print-level* 2)
             (*print-pretty* nil))
-        (format nil "~{~{~S~^ ~}~^ => ~}" context)))))
+        (format nil "~{~{~S~^ ~}~^ => ~}"
+                #+sb-xc-host (list (list (caar context)))
+                #-sb-xc-host context)))))
 \f
 ;;;; condition system interface
 

diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp
index e566c37..044097a 100644 (file)
--- a/src/compiler/ir1tran.lisp
+++ b/src/compiler/ir1tran.lisp
@@ -457,7 +457,7 @@
     (let* ((forms (if for-value `(,form) `(,form nil)))
            (res (ir1-convert-lambda-body
                  forms ()
-                 :debug-name (debug-name 'top-level-form form))))
+                 :debug-name (debug-name 'top-level-form #+sb-xc-host nil #-sb-xc-host form))))
       (setf (functional-entry-fun res) res
             (functional-arg-documentation res) ()
             (functional-kind res) :toplevel)
@@ -707,8 +707,7 @@
                       (not (fun-lexically-notinline-p cmacro-fun-name)))
                  (let ((res (careful-expand-macro cmacro-fun form)))
                    (if (eq res form)
-                       (ir1-convert-common-functoid start next result form
-                                                    op)
+                       (ir1-convert-common-functoid start next result form op)
                        (ir1-convert start next result res)))
                  (ir1-convert-common-functoid start next result form op)))))))
 

diff --git a/version.lisp-expr b/version.lisp-expr
index e1c7c53..20c9e58 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.27.34"
+"1.0.27.35"