[llvm] c92de29 - [NFC] Add size inference to to_vector
Geoffrey Martin-Noble via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 4 09:24:10 PDT 2021
Author: Geoffrey Martin-Noble
Date: 2021-11-04T09:24:02-07:00
New Revision: c92de29f8d39729678dfe2c915035e453dd83142
URL: https://github.com/llvm/llvm-project/commit/c92de29f8d39729678dfe2c915035e453dd83142
DIFF: https://github.com/llvm/llvm-project/commit/c92de29f8d39729678dfe2c915035e453dd83142.diff
LOG: [NFC] Add size inference to to_vector
A default calculated size for SmallVector was added in
https://reviews.llvm.org/D92522 after discussion in
https://groups.google.com/g/llvm-dev/c/Z-VwNCTRGSg, but to_vector still
requires an explicit size. This patch adds the default size to to_vector
as well, so that this case doesn't unnecessarily force users to pick an
arbitrary size.
Reviewed By: silvas, dblaikie
Differential Revision: https://reviews.llvm.org/D112968
Added:
Modified:
llvm/include/llvm/ADT/SmallVector.h
llvm/unittests/ADT/STLExtrasTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h
index b8a11030fc33..0d13524f25ce 100644
--- a/llvm/include/llvm/ADT/SmallVector.h
+++ b/llvm/include/llvm/ADT/SmallVector.h
@@ -1239,13 +1239,22 @@ inline size_t capacity_in_bytes(const SmallVector<T, N> &X) {
return X.capacity_in_bytes();
}
+template <typename RangeType>
+using ValueTypeFromRangeType =
+ typename std::remove_const<typename std::remove_reference<
+ decltype(*std::begin(std::declval<RangeType &>()))>::type>::type;
+
/// Given a range of type R, iterate the entire range and return a
/// SmallVector with elements of the vector. This is useful, for example,
/// when you want to iterate a range and then sort the results.
template <unsigned Size, typename R>
-SmallVector<typename std::remove_const<typename std::remove_reference<
- decltype(*std::begin(std::declval<R &>()))>::type>::type,
- Size>
+SmallVector<ValueTypeFromRangeType<R>, Size> to_vector(R &&Range) {
+ return {std::begin(Range), std::end(Range)};
+}
+template <typename R>
+SmallVector<ValueTypeFromRangeType<R>,
+ CalculateSmallVectorDefaultInlinedElements<
+ ValueTypeFromRangeType<R>>::value>
to_vector(R &&Range) {
return {std::begin(Range), std::end(Range)};
}
diff --git a/llvm/unittests/ADT/STLExtrasTest.cpp b/llvm/unittests/ADT/STLExtrasTest.cpp
index de2c8968aac1..c286cd5263a4 100644
--- a/llvm/unittests/ADT/STLExtrasTest.cpp
+++ b/llvm/unittests/ADT/STLExtrasTest.cpp
@@ -307,6 +307,13 @@ TEST(STLExtrasTest, ToVector) {
EXPECT_EQ(I, Enumerated[I].index());
EXPECT_EQ(v[I], Enumerated[I].value());
}
+
+ auto EnumeratedImplicitSize = to_vector(enumerate(v));
+ ASSERT_EQ(3u, EnumeratedImplicitSize.size());
+ for (size_t I = 0; I < v.size(); ++I) {
+ EXPECT_EQ(I, EnumeratedImplicitSize[I].index());
+ EXPECT_EQ(v[I], EnumeratedImplicitSize[I].value());
+ }
}
TEST(STLExtrasTest, ConcatRange) {
More information about the llvm-commits
mailing list