1.0.9.10: make tests clean up after themselves a bit better

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

diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp
index 8f80aef..15ac812 100644 (file)
--- a/src/compiler/ir1tran.lisp
+++ b/src/compiler/ir1tran.lisp
@@ -447,11 +447,12 @@
                             (sub-find-source-paths fm (cons pos path))
                             ;; Otherwise store the containing form. It's
                             ;; not perfect, but better than nothing.
-                            (setf (gethash subform *source-paths*)
-                                  (list* 'original-source-start
-                                         *current-form-number*
-                                         pos
-                                         path)))
+                            (unless (zerop pos)
+                              (setf (gethash subform *source-paths*)
+                                    (list* 'original-source-start
+                                           *current-form-number*
+                                           pos
+                                           path))))
                         (incf pos))
                       (setq subform (cdr subform))
                       (when (eq subform trail) (return)))))
@@ -873,7 +874,7 @@
                  (not (gethash form *source-paths*)))
         (let ((*current-path* (gethash forms *source-paths*)))
           (when *current-path*
-            (instrument-coverage start :progn form))))
+            (instrument-coverage start nil form))))
       start))
 
 (defun record-code-coverage (info cc)