!fixup address latest comments, thanks!

Author: fhahn

llvm/include/llvm/ADT/ArrayRef.h

@@ -152,14 +152,15 @@ namespace llvm {
     /// Construct an ArrayRef<T> from iterator_range<U*>. This uses SFINAE
     /// to ensure that this is only used for iterator ranges of random access
     /// iterators that can be converted.
-    template <typename U>
-    ArrayRef(const iterator_range<U *> &Range,
-             std::enable_if_t<std::is_base_of<std::random_access_iterator_tag,
-                                              typename std::iterator_traits<
-                                                  decltype(Range.begin())>::
-                                                  iterator_category>::value &&
-                                  std::is_convertible<U *, T const *>::value,
-                              void> * = nullptr)
+    template <typename U,
+              typename = std::enable_if_t<
+                  std::is_base_of<
+                      std::random_access_iterator_tag,
+                      typename std::iterator_traits<
+                          decltype(std::declval<const iterator_range<U *> &>()
+                                       .begin())>::iterator_category>::value &&
+                  std::is_convertible_v<U *, T const *>>>
+    ArrayRef(const iterator_range<U *> &Range)
         : Data(Range.begin()), Length(llvm::size(Range)) {}
 
     /// @}

llvm/unittests/ADT/ArrayRefTest.cpp

@@ -260,19 +260,17 @@ TEST(ArrayRefTest, ArrayRefFromIteratorRange) {
   ArrayRef<int> A2 = make_range(A1.begin(), A1.end());
 
   EXPECT_EQ(A1.size(), A2.size());
-  for (std::size_t i = 0; i < A1.size(); ++i) {
+  for (std::size_t i = 0; i < A1.size(); ++i)
     EXPECT_EQ(A1[i], A2[i]);
-  }
 }
 
 TEST(ArrayRefTest, ArrayRefFromIteratorConstRange) {
   std::array<const int, 5> A1{{42, -5, 0, 1000000, -1000000}};
   ArrayRef<const int> A2 = make_range(A1.begin(), A1.end());
 
   EXPECT_EQ(A1.size(), A2.size());
-  for (std::size_t i = 0; i < A1.size(); ++i) {
+  for (std::size_t i = 0; i < A1.size(); ++i)
     EXPECT_EQ(A1[i], A2[i]);
-  }
 }
 
 static_assert(std::is_trivially_copyable_v<ArrayRef<int>>,