diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h --- a/llvm/include/llvm/ADT/SmallVector.h +++ b/llvm/include/llvm/ADT/SmallVector.h @@ -460,7 +460,8 @@ this->Size = 0; } - void resize(size_type N) { +private: + template void resizeImpl(size_type N) { if (N < this->size()) { this->destroy_range(this->begin()+N, this->end()); this->set_size(N); @@ -468,11 +469,20 @@ if (this->capacity() < N) this->grow(N); for (auto I = this->end(), E = this->begin() + N; I != E; ++I) - new (&*I) T(); + if (ForOverwrite) + new (&*I) T; + else + new (&*I) T(); this->set_size(N); } } +public: + void resize(size_type N) { resizeImpl(N); } + + /// Like resize, but \ref T is POD, the new values won't be initialized. + void resize_for_overwrite(size_type N) { resizeImpl(N); } + void resize(size_type N, const T &NV) { if (N == this->size()) return; diff --git a/llvm/unittests/ADT/SmallVectorTest.cpp b/llvm/unittests/ADT/SmallVectorTest.cpp --- a/llvm/unittests/ADT/SmallVectorTest.cpp +++ b/llvm/unittests/ADT/SmallVectorTest.cpp @@ -341,6 +341,31 @@ this->assertValuesInOrder(this->theVector, 3u, 77, 77, 77); } +TEST(SmallVectorTest, ResizeForOverwrite) { + { + // Heap allocated storage + SmallVector V; + V.push_back(5); + V.pop_back(); + V.resize_for_overwrite(V.size() + 1); + EXPECT_EQ(5, V.back()); + V.pop_back(); + V.resize(V.size() + 1); + EXPECT_EQ(0, V.back()); + } + { + // Inline storage + SmallVector V; + V.push_back(5); + V.pop_back(); + V.resize_for_overwrite(V.size() + 1); + EXPECT_EQ(5, V.back()); + V.pop_back(); + V.resize(V.size() + 1); + EXPECT_EQ(0, V.back()); + } +} + // Overflow past fixed size. TYPED_TEST(SmallVectorTest, OverflowTest) { SCOPED_TRACE("OverflowTest");