[Sanitizer] Remove the hardcoded limit of address ranges in LoadedModule.

This should fix https://code.google.com/p/address-sanitizer/issues/detail?id=368.

llvm-svn: 225469

1 files changed, 6 insertions, 5 deletions

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_coverage_mapping_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
index c0e406abd24..f2f109a4086 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
@@ -79,11 +79,12 @@ void CovUpdateMapping(const char *coverage_dir, uptr caller_pc) {
   text.append("%d\n", sizeof(uptr) * 8);
   for (int i = 0; i < n_modules; ++i) {
     const char *module_name = StripModuleName(modules[i].full_name());
-    for (unsigned j = 0; j < modules[i].n_ranges(); ++j) {
-      if (modules[i].address_range_executable(j)) {
-        uptr start = modules[i].address_range_start(j);
-        uptr end = modules[i].address_range_end(j);
-        uptr base = modules[i].base_address();
+    uptr base = modules[i].base_address();
+    for (auto iter = modules[i].ranges(); iter.hasNext();) {
+      const auto *range = iter.next();
+      if (range->executable) {
+        uptr start = range->beg;
+        uptr end = range->end;
         text.append("%zx %zx %zx %s\n", start, end, base, module_name);
         if (caller_pc && caller_pc >= start && caller_pc < end)
           cached_mapping.SetModuleRange(start, end);