X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fdebug.lisp;h=9c37ee19b56b88da64376ad8e893898db39e0eca;hb=49e8403800426f37a54d9b87353a31af36e7af40;hp=c5a08587a52eb896b0d28a73db8e3c764b19ad98;hpb=731da68c7e3b7f2c4bc310aa75fc75f5aead24d2;p=sbcl.git

diff --git a/src/compiler/debug.lisp b/src/compiler/debug.lisp
index c5a0858..9c37ee1 100644
--- a/src/compiler/debug.lisp
+++ b/src/compiler/debug.lisp
@@ -122,7 +122,7 @@
              (unless (or (constant-p v)
                          (and (global-var-p v)
                               (member (global-var-kind v)
-                                      '(:global :special))))
+                                      '(:global :special :unknown))))
                (barf "strange *FREE-VARS* entry: ~S" v))
              (dolist (n (leaf-refs v))
                (check-node-reached n))
@@ -642,7 +642,7 @@
                                    atypes)
                      (template-more-args-type info) "args")
       (check-tn-refs (vop-results vop) vop t
-                     (if (eq rtypes :conditional) 0 (length rtypes))
+                     (if (template-conditional-p info) 0 (length rtypes))
                      (template-more-results-type info) "results")
       (check-tn-refs (vop-temps vop) vop t 0 t "temps")
       (unless (= (length (vop-codegen-info vop))
@@ -1009,7 +1009,12 @@
              (case (cleanup-kind cleanup)
                ((:dynamic-extent)
                 (format t "entry DX~{ v~D~}"
-                        (mapcar #'cont-num (cleanup-info cleanup))))
+                        (mapcar (lambda (lvar-or-cell)
+                                  (if (consp lvar-or-cell)
+                                      (cons (car lvar-or-cell)
+                                            (cont-num (cdr lvar-or-cell)))
+                                      (cont-num lvar-or-cell)))
+                                (cleanup-info cleanup))))
                (t
                 (format t "entry ~S" (entry-exits node))))))
           (exit