Adding support for overlapping ranges to RangeMap.

src/processor/map_serializers_unittest.cc

 // Copyright (c) 2010, 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 219 matching lines @@
       1,
       // Offsets
       12,
       // Keys: high address
       10,
       // Values: (low address, entry) pairs
       1, 6
   };
   uint32_t correct_size = sizeof(correct_data);
 
-  range_map_.StoreRange(1, 10, 6);
+  range_map_.StoreRange(1, 0 /* delta */, 10, 6);
 
   serialized_data_ = serializer_.Serialize(range_map_, &serialized_size_);
 
   EXPECT_EQ(correct_size, serialized_size_);
   EXPECT_EQ(memcmp(correct_data, serialized_data_, correct_size), 0);
 }
 
 TEST_F(TestRangeMapSerializer, MapWithThreeRangesTestCase) {
   const int32_t correct_data[] = {
       // # of nodes
       3,
       // Offsets
       28,    36,    44,
       // Keys: high address
       5,     9,     20,
       // Values: (low address, entry) pairs
       2, 1,  6, 2,  10, 3
   };
   uint32_t correct_size = sizeof(correct_data);
 
-  ASSERT_TRUE(range_map_.StoreRange(2, 4, 1));
-  ASSERT_TRUE(range_map_.StoreRange(6, 4, 2));
-  ASSERT_TRUE(range_map_.StoreRange(10, 11, 3));
+  ASSERT_TRUE(range_map_.StoreRange(2, 0 /* delta */, 4, 1));
+  ASSERT_TRUE(range_map_.StoreRange(6, 0 /* delta */, 4, 2));
+  ASSERT_TRUE(range_map_.StoreRange(10, 0 /* delta */, 11, 3));
 
   serialized_data_ = serializer_.Serialize(range_map_, &serialized_size_);
 
   EXPECT_EQ(correct_size, serialized_size_);
   EXPECT_EQ(memcmp(correct_data, serialized_data_, correct_size), 0);
 }
 
 
 class TestContainedRangeMapSerializer : public ::testing::Test {
  protected:
@@ skipping 103 matching lines @@
   EXPECT_EQ(correct_size, serialized_size_);
   EXPECT_EQ(memcmp(correct_data, serialized_data_, correct_size), 0);
 }
 
 
 int main(int argc, char *argv[]) {
   ::testing::InitGoogleTest(&argc, argv);
 
   return RUN_ALL_TESTS();
 }