Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion llvm/include/llvm/ADT/SmallVector.h
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,12 @@ class SmallVectorImpl : public SmallVectorTemplateBase<T> {

void assign(const SmallVectorImpl &RHS) { assign(RHS.begin(), RHS.end()); }

template <typename U,
typename = std::enable_if_t<std::is_convertible_v<U, T>>>
void assign(ArrayRef<U> AR) {
assign(AR.begin(), AR.end());
}

iterator erase(const_iterator CI) {
// Just cast away constness because this is a non-const member function.
iterator I = const_cast<iterator>(CI);
Expand Down Expand Up @@ -1228,7 +1234,7 @@ class LLVM_GSL_OWNER SmallVector : public SmallVectorImpl<T>,
}

template <typename U,
typename = std::enable_if_t<std::is_convertible<U, T>::value>>
typename = std::enable_if_t<std::is_convertible_v<U, T>>>
explicit SmallVector(ArrayRef<U> A) : SmallVectorImpl<T>(N) {
this->append(A.begin(), A.end());
}
Expand Down
9 changes: 9 additions & 0 deletions llvm/unittests/ADT/SmallVectorTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,15 @@ TYPED_TEST(SmallVectorTest, AssignSmallVector) {
assertValuesInOrder(V, 2u, 7, 7);
}

TYPED_TEST(SmallVectorTest, AssignArrayRef) {
SCOPED_TRACE("AssignArrayRef");
auto &V = this->theVector;
Constructable Other[] = {7, 8, 9};
V.push_back(Constructable(1));
V.assign(ArrayRef(Other));
assertValuesInOrder(V, 3u, 7, 8, 9);
}

// Move-assign test
TYPED_TEST(SmallVectorTest, MoveAssignTest) {
SCOPED_TRACE("MoveAssignTest");
Expand Down
Loading