summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2015-08-12 23:26:12 +0000
committerDavid Blaikie <dblaikie@gmail.com>2015-08-12 23:26:12 +0000
commitb600718a350e0e1a07cb83d607a58724bafb03a0 (patch)
treef59e22b947425794113045c3f90623d959351861
parent372889a8e6ca9938c74e2887c91ff4daafef7f1c (diff)
downloadbcm5719-llvm-b600718a350e0e1a07cb83d607a58724bafb03a0.tar.gz
bcm5719-llvm-b600718a350e0e1a07cb83d607a58724bafb03a0.zip
Simplify PackedVector by removing user-defined special members that aren't any different than the defaults
This causes the other special members (like move and copy construction, and move assignment) to come through for free. Some code in clang was depending on the (deprecated, in the original code) copy ctor. Now that there's no user-defined special members, they're all available without any deprecation concerns. llvm-svn: 244835
-rw-r--r--llvm/include/llvm/ADT/PackedVector.h11
-rw-r--r--llvm/unittests/ADT/PackedVectorTest.cpp12
2 files changed, 1 insertions, 22 deletions
diff --git a/llvm/include/llvm/ADT/PackedVector.h b/llvm/include/llvm/ADT/PackedVector.h
index 2341e89fa11..09267173fd7 100644
--- a/llvm/include/llvm/ADT/PackedVector.h
+++ b/llvm/include/llvm/ADT/PackedVector.h
@@ -96,7 +96,7 @@ public:
}
};
- PackedVector() { }
+ PackedVector() = default;
explicit PackedVector(unsigned size) : Bits(size << (BitNum-1)) { }
bool empty() const { return Bits.empty(); }
@@ -135,19 +135,10 @@ public:
return Bits != RHS.Bits;
}
- const PackedVector &operator=(const PackedVector &RHS) {
- Bits = RHS.Bits;
- return *this;
- }
-
PackedVector &operator|=(const PackedVector &RHS) {
Bits |= RHS.Bits;
return *this;
}
-
- void swap(PackedVector &RHS) {
- Bits.swap(RHS.Bits);
- }
};
// Leave BitNum=0 undefined.
diff --git a/llvm/unittests/ADT/PackedVectorTest.cpp b/llvm/unittests/ADT/PackedVectorTest.cpp
index 55b5d8d049d..199a6704309 100644
--- a/llvm/unittests/ADT/PackedVectorTest.cpp
+++ b/llvm/unittests/ADT/PackedVectorTest.cpp
@@ -52,18 +52,6 @@ TEST(PackedVectorTest, Operation) {
EXPECT_FALSE(Vec == Vec2);
EXPECT_TRUE(Vec != Vec2);
- Vec2.swap(Vec);
- EXPECT_EQ(3U, Vec.size());
- EXPECT_FALSE(Vec.empty());
- EXPECT_EQ(0U, Vec[0]);
- EXPECT_EQ(0U, Vec[1]);
- EXPECT_EQ(0U, Vec[2]);
-
- EXPECT_EQ(2U, Vec2[0]);
- EXPECT_EQ(0U, Vec2[1]);
- EXPECT_EQ(1U, Vec2[2]);
- EXPECT_EQ(3U, Vec2[3]);
-
Vec = Vec2;
EXPECT_TRUE(Vec == Vec2);
EXPECT_FALSE(Vec != Vec2);
OpenPOWER on IntegriCloud