6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-21 18:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Missed formatting

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208362 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2014-05-08 21:53:33 +00:00
parent 2b94fa799b
commit 50f8a53856
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,10 @@ protected:
: TheTable(nullptr),
// Initialize the map with zero buckets to allocation.
NumBuckets(0), NumItems(0), NumTombstones(0), ItemSize(itemSize) {}
StringMapImpl(StringMapImpl &&RHS) : TheTable(RHS.TheTable), NumBuckets(RHS.NumBuckets), NumItems(RHS.NumItems), NumTombstones(RHS.NumTombstones), ItemSize(RHS.ItemSize) {
StringMapImpl(StringMapImpl &&RHS)
: TheTable(RHS.TheTable), NumBuckets(RHS.NumBuckets),
NumItems(RHS.NumItems), NumTombstones(RHS.NumTombstones),
ItemSize(RHS.ItemSize) {
RHS.TheTable = nullptr;
RHS.NumBuckets = 0;
RHS.NumItems = 0;
@ -115,7 +118,7 @@ public:
explicit StringMapEntry(unsigned strLen)
: StringMapEntryBase(strLen), second() {}
StringMapEntry(unsigned strLen, ValueTy V)
: StringMapEntryBase(strLen), second(std::move(V)) {}
: StringMapEntryBase(strLen), second(std::move(V)) {}
StringRef getKey() const {
return StringRef(getKeyData(), getKeyLength());
@ -351,7 +354,7 @@ public:
return *static_cast<MapEntryTy*>(Bucket);
MapEntryTy *NewItem =
MapEntryTy::Create(Key.begin(), Key.end(), Allocator, std::move(Val));
MapEntryTy::Create(Key.begin(), Key.end(), Allocator, std::move(Val));
if (Bucket == getTombstoneVal())
--NumTombstones;

22
unittests/ADT/StringMapTest.cpp
View File

@ -221,17 +221,18 @@ TEST_F(StringMapTest, NonDefaultConstructable) {
struct MoveOnly {
int i;
MoveOnly(int i) : i(i) {}
MoveOnly(MoveOnly&&) = default;
MoveOnly(const MoveOnly&) = delete;
MoveOnly &operator=(MoveOnly&&) = default;
MoveOnly &operator=(const MoveOnly&) = delete;
MoveOnly(MoveOnly &&) = default;
MoveOnly(const MoveOnly &) = delete;
MoveOnly &operator=(MoveOnly &&) = default;
MoveOnly &operator=(const MoveOnly &) = delete;
};
TEST_F(StringMapTest, MoveOnlyKey) {
StringMap<MoveOnly> t;
t.GetOrCreateValue("Test", MoveOnly(42));
StringRef Key = "Test";
StringMapEntry<MoveOnly>::Create(Key.begin(), Key.end(), MoveOnly(42))->Destroy();
StringMapEntry<MoveOnly>::Create(Key.begin(), Key.end(), MoveOnly(42))
->Destroy();
}
TEST_F(StringMapTest, MoveConstruct) {
@ -259,24 +260,23 @@ TEST_F(StringMapTest, MoveAssignment) {
struct Countable {
int &InstanceCount;
int Number;
Countable(int Number, int &InstanceCount) :InstanceCount(InstanceCount), Number(Number) {
Countable(int Number, int &InstanceCount)
: InstanceCount(InstanceCount), Number(Number) {
++InstanceCount;
}
Countable(Countable &&C) : InstanceCount(C.InstanceCount), Number(C.Number) {
++InstanceCount;
C.Number = -1;
}
Countable(const Countable &C) : InstanceCount(C.InstanceCount), Number(C.Number) {
Countable(const Countable &C)
: InstanceCount(C.InstanceCount), Number(C.Number) {
++InstanceCount;
}
Countable &operator=(Countable C) {
Number = C.Number;
return *this;
}
~Countable() {
--InstanceCount;
}
~Countable() { --InstanceCount; }
};
TEST_F(StringMapTest, MoveDtor) {