[cmucl-commit] [git] CMU Common Lisp branch master updated. 20e-3-g622b5df

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  622b5df431a87ae3c8a816b7c569f5c5ef85a6d7 (commit)
      from  40aa2475c25a2715e100bbde7ba7db437a8a4326 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 622b5df431a87ae3c8a816b7c569f5c5ef85a6d7
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Sun Oct 20 09:47:38 2013 -0700

    Add some (runtime-enabled) debugging help for packing failures.

diff --git a/src/compiler/pack.lisp b/src/compiler/pack.lisp
index 91ae142..bac8116 100644
--- a/src/compiler/pack.lisp
+++ b/src/compiler/pack.lisp
@@ -340,6 +340,8 @@
 	           VM definition inconsistent, try recompiling.")))))
 
 
+(defvar *debug-pack* nil)
+
 ;;; FAILED-TO-PACK-ERROR  --  Internal
 ;;;
 ;;;    Called when we failed to pack TN.  If Restricted is true, then we we
@@ -351,8 +353,12 @@
 	 (scs (cons sc (sc-alternate-scs sc))))
     (cond
      (restricted
-      (error "Failed to pack restricted TN ~S in its SC ~S."
-	     tn (sc-name sc)))
+      (when *debug-pack*
+	;; Useful for possibly figuring out which vop might be the
+	;; source of the conflict.
+	(describe tn))
+      (error "Failed to pack restricted TN ~S in its SC ~S: ~S"
+	     tn (sc-name sc) (tn-sc tn)))
      (t
       (assert (not (find :unbounded scs
 			 :key #'(lambda (x) (sb-kind (sc-sb x))))))
@@ -1511,7 +1517,8 @@
 	  (when (and save
 		     (eq (tn-kind save) :specified-save))
 	    (tn-sc save))))
-
+    (when *debug-pack*
+      (format t "pack-tn alternates: ~S~%" alternates))
     (do ((sc fsc (pop alternates)))
 	((null sc)
 	 (failed-to-pack-error tn restricted))

-----------------------------------------------------------------------

Summary of changes:
 src/compiler/pack.lisp |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp