Server-side workaround to handle overlapping modules.

src/processor/basic_code_modules.h

Index: src/processor/basic_code_modules.h
diff --git a/src/processor/basic_code_modules.h b/src/processor/basic_code_modules.h
index 97579b4dfef20ff2e087ae107c6faf4ea1b0799a..50f8a03d817ab2f4564709c63293437f8b35d9f3 100644
--- a/src/processor/basic_code_modules.h
+++ b/src/processor/basic_code_modules.h
@@ -43,6 +43,8 @@
 
 #include <stddef.h>
 
+#include <vector>
+
 #include "google_breakpad/processor/code_modules.h"
 #include "processor/linked_ptr.h"
 #include "processor/range_map.h"
@@ -67,6 +69,9 @@ class BasicCodeModules : public CodeModules {
   virtual const CodeModule* GetModuleAtSequence(unsigned int sequence) const;
   virtual const CodeModule* GetModuleAtIndex(unsigned int index) const;
   virtual const CodeModules* Copy() const;
+  virtual std::vector<linked_ptr<const CodeModule> >
+  GetShrunkRangeModules() const;
+  virtual bool IsModuleShrinkEnabled() const;
 
  protected:
   BasicCodeModules();
@@ -78,6 +83,10 @@ class BasicCodeModules : public CodeModules {
   // address range.
   RangeMap<uint64_t, linked_ptr<const CodeModule> > map_;
 
+  // A vector of all CodeModules that were shrunk downs due to
+  // address range conflicts.
+  std::vector<linked_ptr<const CodeModule> > shrunk_range_modules_;
+
  private:
   // Disallow copy constructor and assignment operator.
   BasicCodeModules(const BasicCodeModules &that);