summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--tapsets.cxx9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3862eb30..0bf0ec70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-17 Stan Cox <scox@redhat.com>
+
+ * tapsets.cxx (iterate_over_srcfile_lines): Avoid statement wildcard
+ lines without a unique address.
+
2008-07-17 <anithra@linux.vnet.ibm.com>
* main.cxx (handle_interrupt): Forward received signal to process
diff --git a/tapsets.cxx b/tapsets.cxx
index 05fda9bd..3d5af360 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -1282,7 +1282,7 @@ struct dwflpp
Dwarf_Addr line_addr;
dwarf_lineno (srcsp [0], &lineno);
line_probed = lines_probed.insert(lineno);
- if (lineno != l || line_probed.second == false)
+ if (lineno != l || line_probed.second == false || nsrcs > 1)
continue;
dwarf_lineaddr (srcsp [0], &line_addr);
if (dwarf_haspc (function, line_addr) != 1)
@@ -1347,8 +1347,11 @@ struct dwflpp
if (srcsp [i]) // skip over mismatched lines
callback (dwarf_line_t(srcsp[i]), data);
}
- if (line_type != WILDCARD || l == lines[1])
- break;
+
+ if (line_type == ABSOLUTE || line_type == RELATIVE)
+ break;
+ else if (line_type == RANGE && l == lines[1])
+ break;
}
}