6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-07 14:33:15 +00:00
Code Issues Projects Releases Wiki Activity

StringMap: Test and finish off supporting perfectly forwarded values in StringMap operations.

Browse Source 
Followup to r221946.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221958 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2014-11-14 00:41:46 +00:00
parent 677506434b
commit 7987683c39
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/llvm/ADT/StringMap.h
View File

@ -170,9 +170,9 @@ public:
/// Create - Create a StringMapEntry with normal malloc/free.
template<typename InitType>
static StringMapEntry *Create(StringRef Key, InitType InitVal) {
static StringMapEntry *Create(StringRef Key, InitType &&InitVal) {
MallocAllocator A;
return Create(Key, A, std::move(InitVal));
return Create(Key, A, std::forward<InitType>(InitVal));
}
static StringMapEntry *Create(StringRef Key) {
@ -367,8 +367,9 @@ public:
/// exists, return it. Otherwise, default construct a value, insert it, and
/// return.
template <typename InitTy>
MapEntryTy &GetOrCreateValue(StringRef Key, InitTy Val) {
return *insert(std::make_pair(Key, std::move(Val))).first;
MapEntryTy &GetOrCreateValue(StringRef Key, InitTy &&Val) {
return *insert(std::pair<StringRef, ValueTy>(
Key, std::forward<InitTy>(Val))).first;
}
MapEntryTy &GetOrCreateValue(StringRef Key) {

16
unittests/ADT/StringMapTest.cpp
View File

@ -256,9 +256,15 @@ TEST_F(StringMapTest, NonDefaultConstructable) {
ASSERT_EQ(iter->second.i, 123);
}
struct Immovable {
Immovable() {}
Immovable(Immovable&&) LLVM_DELETED_FUNCTION; // will disable the other special members
};
struct MoveOnly {
int i;
MoveOnly(int i) : i(i) {}
MoveOnly(const Immovable&) : i(0) {}
MoveOnly(MoveOnly &&RHS) : i(RHS.i) {}
MoveOnly &operator=(MoveOnly &&RHS) {
i = RHS.i;
@ -270,7 +276,7 @@ private:
MoveOnly &operator=(const MoveOnly &) LLVM_DELETED_FUNCTION;
};
TEST_F(StringMapTest, MoveOnlyKey) {
TEST_F(StringMapTest, MoveOnly) {
StringMap<MoveOnly> t;
t.GetOrCreateValue("Test", MoveOnly(42));
StringRef Key = "Test";
@ -278,6 +284,14 @@ TEST_F(StringMapTest, MoveOnlyKey) {
->Destroy();
}
TEST_F(StringMapTest, CtorArg) {
StringMap<MoveOnly> t;
t.GetOrCreateValue("Test", Immovable());
StringRef Key = "Test";
StringMapEntry<MoveOnly>::Create(Key, Immovable())
->Destroy();
}
TEST_F(StringMapTest, MoveConstruct) {
StringMap<int> A;
A.GetOrCreateValue("x", 42);