Skip to content

Commit 8ecb2f9

Browse files
authored
[ADT] Add DenseMap::insert_range (llvm#133600)
This PR add `DenseMap::insert_range` to `DenseMap` for consistency with existing `DenseSet::insert_range`, `SmallSet::insert_range` and `std::map::insert_range`.
1 parent 52639d6 commit 8ecb2f9

File tree

3 files changed

+35
-0
lines changed

3 files changed

+35
-0
lines changed

llvm/include/llvm/ADT/DenseMap.h

+6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#ifndef LLVM_ADT_DENSEMAP_H
1515
#define LLVM_ADT_DENSEMAP_H
1616

17+
#include "llvm/ADT/ADL.h"
1718
#include "llvm/ADT/DenseMapInfo.h"
1819
#include "llvm/ADT/EpochTracker.h"
1920
#include "llvm/Support/AlignOf.h"
@@ -302,6 +303,11 @@ class DenseMapBase : public DebugEpochBase {
302303
insert(*I);
303304
}
304305

306+
/// Inserts range of 'std::pair<KeyT, ValueT>' values into the map.
307+
template <typename Range> void insert_range(Range &&R) {
308+
insert(adl_begin(R), adl_end(R));
309+
}
310+
305311
template <typename V>
306312
std::pair<iterator, bool> insert_or_assign(const KeyT &Key, V &&Val) {
307313
auto Ret = try_emplace(Key, std::forward<V>(Val));

llvm/unittests/ADT/DenseMapTest.cpp

+22
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,28 @@ TEST(DenseMapCustomTest, EqualityComparison) {
379379
EXPECT_NE(M1, M3);
380380
}
381381

382+
TEST(DenseMapCustomTest, InsertRange) {
383+
DenseMap<int, int> M;
384+
385+
std::pair<int, int> InputVals[3] = {{0, 0}, {0, 1}, {1, 2}};
386+
M.insert_range(InputVals);
387+
388+
EXPECT_EQ(M.size(), 2u);
389+
EXPECT_THAT(M, testing::UnorderedElementsAre(testing::Pair(0, 0),
390+
testing::Pair(1, 2)));
391+
}
392+
393+
TEST(SmallDenseMapCustomTest, InsertRange) {
394+
SmallDenseMap<int, int> M;
395+
396+
std::pair<int, int> InputVals[3] = {{0, 0}, {0, 1}, {1, 2}};
397+
M.insert_range(InputVals);
398+
399+
EXPECT_EQ(M.size(), 2u);
400+
EXPECT_THAT(M, testing::UnorderedElementsAre(testing::Pair(0, 0),
401+
testing::Pair(1, 2)));
402+
}
403+
382404
// Test for the default minimum size of a DenseMap
383405
TEST(DenseMapCustomTest, DefaultMinReservedSizeTest) {
384406
// IF THIS VALUE CHANGE, please update InitialSizeTest, InitFromIterator, and

llvm/unittests/ADT/DenseSetTest.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ TEST(DenseSetTest, InsertRange) {
5858
EXPECT_THAT(set, ::testing::UnorderedElementsAre(1, 2, 3));
5959
}
6060

61+
TEST(SmallDenseSetTest, InsertRange) {
62+
llvm::SmallDenseSet<unsigned> set;
63+
constexpr unsigned Args[] = {9, 7, 8};
64+
set.insert_range(Args);
65+
EXPECT_THAT(set, ::testing::UnorderedElementsAre(7, 8, 9));
66+
}
67+
6168
struct TestDenseSetInfo {
6269
static inline unsigned getEmptyKey() { return ~0; }
6370
static inline unsigned getTombstoneKey() { return ~0U - 1; }

0 commit comments

Comments
 (0)