[llvm] 475dd6f - [SmallVector] Add an explicit SmallVector(size_t Size) constructor.

Craig Topper via llvm-commits llvm-commits at lists.llvm.org
Mon Apr 3 13:22:55 PDT 2023


Author: Craig Topper
Date: 2023-04-03T13:22:36-07:00
New Revision: 475dd6f626ee2679578ed570e9fb78f7e957a36d

URL: https://github.com/llvm/llvm-project/commit/475dd6f626ee2679578ed570e9fb78f7e957a36d
DIFF: https://github.com/llvm/llvm-project/commit/475dd6f626ee2679578ed570e9fb78f7e957a36d.diff

LOG: [SmallVector] Add an explicit SmallVector(size_t Size) constructor.

Previously we used the SmallVector(size_t Size, const T& Value) constructor
with a default constructed Value. That will copy construct every element
in the vector, but not all types can be copy constructed.

Reviewed By: dblaikie

Differential Revision: https://reviews.llvm.org/D147426

Added: 
    

Modified: 
    llvm/include/llvm/ADT/SmallVector.h
    llvm/unittests/ADT/SmallVectorTest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h
index 98dce891688da..93d94916745d2 100644
--- a/llvm/include/llvm/ADT/SmallVector.h
+++ b/llvm/include/llvm/ADT/SmallVector.h
@@ -1206,7 +1206,12 @@ class LLVM_GSL_OWNER SmallVector : public SmallVectorImpl<T>,
     this->destroy_range(this->begin(), this->end());
   }
 
-  explicit SmallVector(size_t Size, const T &Value = T())
+  explicit SmallVector(size_t Size)
+    : SmallVectorImpl<T>(N) {
+    this->resize(Size);
+  }
+
+  SmallVector(size_t Size, const T &Value)
     : SmallVectorImpl<T>(N) {
     this->assign(Size, Value);
   }

diff  --git a/llvm/unittests/ADT/SmallVectorTest.cpp b/llvm/unittests/ADT/SmallVectorTest.cpp
index fd3780a42ce50..84652576976f7 100644
--- a/llvm/unittests/ADT/SmallVectorTest.cpp
+++ b/llvm/unittests/ADT/SmallVectorTest.cpp
@@ -171,6 +171,11 @@ LLVM_ATTRIBUTE_USED void CompileTest() {
   V.resize(42);
 }
 
+TEST(SmallVectorTest, ConstructNonCopyableTest) {
+  SmallVector<NonCopyable, 0> V(42);
+  EXPECT_EQ(V.size(), 42);
+}
+
 // Assert that v contains the specified values, in order.
 template <typename VectorT>
 void assertValuesInOrder(VectorT &v, size_t size, ...) {


        


More information about the llvm-commits mailing list