aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorJoshua Peraza <jperaza@chromium.org>2018-08-17 18:27:24 -0700
committerJoshua Peraza <jperaza@chromium.org>2018-08-18 01:46:46 +0000
commit1459e5df74dd03b7d3d473e6d271413d7aa98a88 (patch)
tree861884ff3913292dcf5afb84ec2f53e9a2ed99bf /src/common
parentMake a parameter a const reference (diff)
downloadbreakpad-1459e5df74dd03b7d3d473e6d271413d7aa98a88.tar.xz
Fix debug build after 16e0852
Also remove ranges_handler_ which is unused. Change-Id: I771bf4b5fc4410f0406bf26e1e405905b55389ab Reviewed-on: https://chromium-review.googlesource.com/1180587 Reviewed-by: Mark Mentovai <mark@chromium.org>
Diffstat (limited to 'src/common')
-rw-r--r--src/common/dwarf_cu_to_module.h3
-rw-r--r--src/common/module.cc10
2 files changed, 6 insertions, 7 deletions
diff --git a/src/common/dwarf_cu_to_module.h b/src/common/dwarf_cu_to_module.h
index c1135dd0..f73a3c93 100644
--- a/src/common/dwarf_cu_to_module.h
+++ b/src/common/dwarf_cu_to_module.h
@@ -321,9 +321,6 @@ class DwarfCUToModule: public dwarf2reader::RootDIEHandler {
// The handler to use to handle line number data.
LineToModuleHandler *line_reader_;
- // The handler to use to handle range lists.
- RangesHandler *ranges_handler_;
-
// This compilation unit's context.
scoped_ptr<CUContext> cu_context_;
diff --git a/src/common/module.cc b/src/common/module.cc
index 11bfc444..dc4f957e 100644
--- a/src/common/module.cc
+++ b/src/common/module.cc
@@ -99,10 +99,12 @@ void Module::AddFunction(Function *function) {
#if _DEBUG
{
// There should be no other PUBLIC symbols that overlap with the function.
- Extern debug_ext(function->address);
- ExternSet::iterator it_debug = externs_.lower_bound(&ext);
- assert(it_debug == externs_.end() ||
- (*it_debug)->address >= function->address + function->size);
+ for (const Range& range : function->ranges) {
+ Extern debug_ext(range.address);
+ ExternSet::iterator it_debug = externs_.lower_bound(&ext);
+ assert(it_debug == externs_.end() ||
+ (*it_debug)->address >= range.address + range.size);
+ }
}
#endif