Adding support for overlapping ranges to RangeMap.

src/processor/range_map_unittest.cc

Index: src/processor/range_map_unittest.cc
diff --git a/src/processor/range_map_unittest.cc b/src/processor/range_map_unittest.cc
index bf9b7279ad264f18d193958815704900a41c93cf..2c247114cdff0d83327b37f0a1f3426562184206 100644
--- a/src/processor/range_map_unittest.cc
+++ b/src/processor/range_map_unittest.cc
@@ -104,9 +104,8 @@ struct RangeTestSet {
 // false if something else happened.
 static bool StoreTest(TestMap *range_map, const RangeTest *range_test) {
   linked_ptr<CountedObject> object(new CountedObject(range_test->id));
-  bool stored = range_map->StoreRange(range_test->address,
-                                      range_test->size,
-                                      object);
+  bool stored = range_map->StoreRange(range_test->address, 0 /* delta */,
+                                      range_test->size, object);
 
   if (stored != range_test->expect_storable) {
     fprintf(stderr, "FAILED: "
@@ -166,8 +165,10 @@ static bool RetrieveTest(TestMap *range_map, const RangeTest *range_test) {
       linked_ptr<CountedObject> object;
       AddressType retrieved_base = AddressType();
       AddressType retrieved_size = AddressType();
+      AddressType retrieved_delta = AddressType();
       bool retrieved = range_map->RetrieveRange(address, &object,
                                                 &retrieved_base,
+                                                &retrieved_delta,
                                                 &retrieved_size);
 
       bool observed_result = retrieved && object->id() == range_test->id;
@@ -209,10 +210,12 @@ static bool RetrieveTest(TestMap *range_map, const RangeTest *range_test) {
 
       linked_ptr<CountedObject> nearest_object;
       AddressType nearest_base = AddressType();
+      AddressType nearest_delta = AddressType();
       AddressType nearest_size = AddressType();
       bool retrieved_nearest = range_map->RetrieveNearestRange(address,
                                                                &nearest_object,
                                                                &nearest_base,
+                                                               &nearest_delta,
                                                                &nearest_size);
 
       // When checking one greater than the high side, RetrieveNearestRange
@@ -274,7 +277,8 @@ static bool RetrieveIndexTest(TestMap *range_map, int set) {
   int object_count = range_map->GetCount();
   for (int object_index = 0; object_index < object_count; ++object_index) {
     AddressType base;
-    if (!range_map->RetrieveRangeAtIndex(object_index, &object, &base, NULL)) {
+    if (!range_map->RetrieveRangeAtIndex(object_index, &object, &base,
+                                         NULL, NULL)) {
       fprintf(stderr, "FAILED: RetrieveRangeAtIndex set %d index %d, "
               "expected success, observed failure\n",
               set, object_index);
@@ -314,7 +318,8 @@ static bool RetrieveIndexTest(TestMap *range_map, int set) {
 
   // Make sure that RetrieveRangeAtIndex doesn't allow lookups at indices that
   // are too high.
-  if (range_map->RetrieveRangeAtIndex(object_count, &object, NULL, NULL)) {
+  if (range_map->RetrieveRangeAtIndex(object_count, &object, NULL, NULL,
+                                      NULL)) {
     fprintf(stderr, "FAILED: RetrieveRangeAtIndex set %d index %d (too large), "
             "expected failure, observed success\n",
             set, object_count);
@@ -336,14 +341,15 @@ static bool RetriveAtIndexTest2() {
   for (int object_id = 0; object_id < 100; ++object_id) {
     linked_ptr<CountedObject> object(new CountedObject(object_id));
     int base_address = 2 * object_id;
-    range_map->StoreRange(base_address, range_size, object);
+    range_map->StoreRange(base_address, 0 /* delta */, range_size, object);
   }
 
   linked_ptr<CountedObject> object;
   int object_count = range_map->GetCount();
   for (int object_index = 0; object_index < object_count; ++object_index) {
     AddressType base;
-    if (!range_map->RetrieveRangeAtIndex(object_index, &object, &base, NULL)) {
+    if (!range_map->RetrieveRangeAtIndex(object_index, &object, &base, NULL,
+                                         NULL)) {
       fprintf(stderr, "FAILED: RetrieveAtIndexTest2 index %d, "
               "expected success, observed failure\n", object_index);
       return false;
@@ -550,3 +556,4 @@ int main(int argc, char **argv) {
 
   return RunTests() ? 0 : 1;
 }
+