Adding support for overlapping ranges to RangeMap.

src/processor/basic_code_modules.cc

 // Copyright (c) 2006, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 
 #include <assert.h>
 
 #include "google_breakpad/processor/code_module.h"
 #include "processor/linked_ptr.h"
 #include "processor/logging.h"
 #include "processor/range_map-inl.h"
 
 namespace google_breakpad {
 
-BasicCodeModules::BasicCodeModules(const CodeModules *that)
-    : main_address_(0),
-      map_(new RangeMap<uint64_t, linked_ptr<const CodeModule> >()) {
+BasicCodeModules::BasicCodeModules(const CodeModules *that) : main_address_(0) {

[Mark Mentovai, 2016/06/02 21:43:53]

Explicitly initialize map_ even if it’s just to _().

[ivanpe, 2016/06/02 22:54:02]

Done.

   BPLOG_IF(ERROR, !that) << "BasicCodeModules::BasicCodeModules requires "
                             "|that|";
   assert(that);
 
   const CodeModule *main_module = that->GetMainModule();
   if (main_module)
     main_address_ = main_module->base_address();
 
   unsigned int count = that->module_count();
   for (unsigned int module_sequence = 0;
        module_sequence < count;
        ++module_sequence) {
     // Make a copy of the module and insert it into the map.  Use
     // GetModuleAtIndex because ordering is unimportant when slurping the
     // entire list, and GetModuleAtIndex may be faster than
     // GetModuleAtSequence.
     linked_ptr<const CodeModule> module(
         that->GetModuleAtIndex(module_sequence)->Copy());
-    if (!map_->StoreRange(module->base_address(), module->size(), module)) {
+    if (!map_.StoreRange(module->base_address(), 0 /* delta */, module->size(),
+                         module)) {
       BPLOG(ERROR) << "Module " << module->code_file() <<
                       " could not be stored";
     }
   }
 }
 
-BasicCodeModules::BasicCodeModules()
-  : main_address_(0),
-    map_(new RangeMap<uint64_t, linked_ptr<const CodeModule> >()) {
-}
+BasicCodeModules::BasicCodeModules() : main_address_(0) { }
 
 BasicCodeModules::~BasicCodeModules() {
-  delete map_;
 }
 
 unsigned int BasicCodeModules::module_count() const {
-  return map_->GetCount();
+  return map_.GetCount();
 }
 
 const CodeModule* BasicCodeModules::GetModuleForAddress(
     uint64_t address) const {
   linked_ptr<const CodeModule> module;
-  if (!map_->RetrieveRange(address, &module, NULL, NULL)) {
+  if (!map_.RetrieveRange(address, &module, NULL, NULL, NULL)) {
     BPLOG(INFO) << "No module at " << HexString(address);
     return NULL;
   }
 
   return module.get();
 }
 
 const CodeModule* BasicCodeModules::GetMainModule() const {
   return GetModuleForAddress(main_address_);
 }
 
 const CodeModule* BasicCodeModules::GetModuleAtSequence(
     unsigned int sequence) const {
   linked_ptr<const CodeModule> module;
-  if (!map_->RetrieveRangeAtIndex(sequence, &module, NULL, NULL)) {
+  if (!map_.RetrieveRangeAtIndex(sequence, &module, NULL, NULL, NULL)) {
     BPLOG(ERROR) << "RetrieveRangeAtIndex failed for sequence " << sequence;
     return NULL;
   }
 
   return module.get();
 }
 
 const CodeModule* BasicCodeModules::GetModuleAtIndex(
     unsigned int index) const {
   // This class stores everything in a RangeMap, without any more-efficient
   // way to walk the list of CodeModule objects.  Implement GetModuleAtIndex
   // using GetModuleAtSequence, which meets all of the requirements, and
   // in addition, guarantees ordering.
   return GetModuleAtSequence(index);
 }
 
 const CodeModules* BasicCodeModules::Copy() const {
   return new BasicCodeModules(this);
 }
 
 }  // namespace google_breakpad