Changeset 15013

Timestamp:

Oct 10, 2011, 2:09:20 PM (13 years ago)

Author:

gz

Message:

Only store *fcomp-stream-position* in compiler warnings if it's non-nil, make merge-compiler-warnings deal with the nil case. Fixes ticket:887.

Location:

trunk/source

Files:

• compiler/nx-basic.lisp (modified) (1 diff)
• lib/nfcomp.lisp (modified) (1 diff)

trunk/source/compiler/nx-basic.lisp

@@ -593 +593 @@
                                      (compiler-warning-source-note w1))))
                     (let ((nrefs (compiler-warning-nrefs w1)))
-                      (setf (compiler-warning-nrefs w1)
-                            (cons (compiler-warning-source-note w)
-                                  (or nrefs
-                                      (list (compiler-warning-source-note w1)))))
+                      (when (null nrefs)
+                        (let ((s1 (compiler-warning-source-note w1)))
+                          (when s1
+                            (setq nrefs (list s1)))))
+                      (let ((s (compiler-warning-source-note w)))
+                        (when s (push s nrefs)))
+                      (setf (compiler-warning-nrefs w1) nrefs)
                       (return nil))))))
           (push w warnings))))

trunk/source/lib/nfcomp.lisp

@@ -1154 +1154 @@
         (harsh *fasl-non-style-warnings-signalled-p*))
     (dolist (w warnings)
-      (unless (compiler-warning-source-note w)
+      (when (and (not (compiler-warning-source-note w)) *fcomp-stream-position*)
         (setf (compiler-warning-source-note w)
               (make-source-note :source nil