!fixup is_same_v -> is_convertible_v, is_constructible_v

Author: fhahn

llvm/include/llvm/ADT/ArrayRef.h

@@ -152,7 +152,8 @@ namespace llvm {
     /// Construct an ArrayRef<T> from iterator_range<U*>. This uses SFINAE
     /// to ensure that this is only used for iterator ranges over plain pointer
     /// iterators.
-    template <typename U, typename = std::enable_if_t<std::is_same_v<U *, T *>>>
+    template <typename U,
+              typename = std::enable_if_t<std::is_convertible_v<U *, T *>>>
     ArrayRef(const iterator_range<U *> &Range)
         : Data(Range.begin()), Length(llvm::size(Range)) {}
 

llvm/unittests/ADT/ArrayRefTest.cpp

@@ -259,14 +259,13 @@ struct TestRandomAccessIterator {
   using iterator_category = std::random_access_iterator_tag;
 };
 
-static_assert(
-    !std::is_constructible<ArrayRef<int>,
-                           iterator_range<TestRandomAccessIterator>>::value,
-    "cannot construct from iterator range with non-pointer iterator");
-static_assert(!std::is_constructible<ArrayRef<int>, iterator_range<int>>::value,
+static_assert(!std::is_constructible_v<
+                  ArrayRef<int>, iterator_range<TestRandomAccessIterator>>,
+              "cannot construct from iterator range with non-pointer iterator");
+static_assert(!std::is_constructible_v<ArrayRef<int>, iterator_range<int>>,
               "cannot construct from iterator range with non-pointer iterator");
 static_assert(
-    std::is_constructible<ArrayRef<char *>, iterator_range<char **>>::value,
+    std::is_constructible_v<ArrayRef<char *>, iterator_range<char **>>,
     "should be able to construct ArrayRef from iterator_range over pointers");
 
 TEST(ArrayRefTest, ArrayRefFromIteratorRange) {
@@ -276,6 +275,11 @@ TEST(ArrayRefTest, ArrayRefFromIteratorRange) {
   EXPECT_EQ(A1.size(), A2.size());
   for (std::size_t i = 0; i < A1.size(); ++i)
     EXPECT_EQ(A1[i], A2[i]);
+
+  ArrayRef<const int> A3 = make_range(A1.begin(), A1.end());
+  EXPECT_EQ(A1.size(), A3.size());
+  for (std::size_t i = 0; i < A1.size(); ++i)
+    EXPECT_EQ(A1[i], A3[i]);
 }
 
 TEST(ArrayRefTest, ArrayRefFromIteratorConstRange) {