Make sure source-location mapping entries of size zero are converted

to size one even if verbose more is off.

MERGE TO STABLE

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_2_2_0_BRANCH@2895

diff --git a/coregrind/vg_symtab2.c b/coregrind/vg_symtab2.c
index c0e803cba97407041c114583772cedd5cd3dcbe5..e4dd8284d4eeea9736b8f18933423a1bbcc7bdd6 100644 (file)
--- a/coregrind/vg_symtab2.c
+++ b/coregrind/vg_symtab2.c
@@ -215,10 +215,12 @@ void VG_(addLineInfo) ( SegInfo* si,
     * correspond to one line, unlike with C-level debug info where
     * multiple instructions can map to the one line), but avoid
     * catching any other instructions bogusly. */
-   if (this > next && VG_(clo_verbosity) > 2) {
-       VG_(message)(Vg_DebugMsg, 
-                    "warning: line info addresses out of order "
-                    "at entry %d: 0x%x 0x%x", entry, this, next);
+   if (this > next) {
+       if (VG_(clo_verbosity) > 2) {
+           VG_(message)(Vg_DebugMsg, 
+                        "warning: line info addresses out of order "
+                        "at entry %d: 0x%x 0x%x", entry, this, next);
+       }
        size = 1;
    }