update

[phyBrackets]

Summary

Depends on D136356

[phyBrackets]

Hey @philnik , could you please review this patch instead of the previous one?

[ldionne]

You seem to have two changes stacked on top of each other, and only want the overall result to be reviewed?

I suspect what you wanted to do is simply update the first review with your new changes. That should happen automatically if you amend a commit that already contains a Differential Revision field and then use arc diff again -- it will update the existing review with the new amended diff instead of creating a new one.

If that's correct, I would suggest squashing this change into the previous one, abandoning this review and then running arc diff again on the previous review.

[phyBrackets]

Hey @ldionne Thanks for quick response, I'd squash it here https://reviews.llvm.org/D136356 .

[philnik]

@phyBrackets Please abandon patches that you don't plan to keep working on. This should be landed already.

libcxx/include/__iterator/move_iterator.h

 
 template <class _Iter>
 class _LIBCPP_TEMPLATE_VIS move_iterator
 #if _LIBCPP_STD_VER > 17
     : public __move_iter_category_base<_Iter>
 #endif
 {
     private:
-   
-   static constexpr auto _Get_Iterator_Tag() {
-     if constexpr (__is_cpp17_random_access_iterator<_Iter>::value) {
+    #if _LIBCPP_STD_VER > 17
+   static consteval auto _get_iterator_concept() {
+     if constexpr (random_access_iterator<_Iter>) {
         return random_access_iterator_tag{};
-     } else if constexpr (__is_cpp17_forward_iterator<_Iter>::value) {
-        return forward_iterator_tag{};
-     } else if constexpr (__is_cpp17_bidirectional_iterator<_Iter>::value) {
+     }  else if constexpr (bidirectional_iterator<_Iter>) {
         return bidirectional_iterator_tag{};
+     } else if constexpr (forward_iterator<_Iter>) {
+        return forward_iterator_tag{};
      } else {
         return input_iterator_tag{}; 
      }
    }
+   #endif //_LIBCPP_STD_VER > 17  
     template<class _It2> friend class move_iterator;
 
     _Iter __current_;
     
 public:
 #if _LIBCPP_STD_VER > 17
     using iterator_type = _Iter;
-    using iterator_concept = decltype(_Get_Iterator_Tag());
+    using iterator_concept = decltype(_get_iterator_concept());
     // iterator_category is inherited and not always present
     using value_type = iter_value_t<_Iter>;
     using difference_type = iter_difference_t<_Iter>;
     using pointer = _Iter;
     using reference = iter_rvalue_reference_t<_Iter>;
 #else
     typedef _Iter iterator_type;
     typedef _If<

libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp

#if TEST_STD_VER >= 11
       typedef DummyIt<int, int&&> T;
       typedef std::move_iterator<T> It;
       static_assert(std::is_same<It::reference, int&&>::value, "");
   }
 #endif
 
 #if TEST_STD_VER > 17
   test<contiguous_iterator<char*>>();
-  static_assert(std::is_same_v<typename std::move_iterator<forward_iterator<char*>>::iterator_concept, std::input_iterator_tag>);
-  static_assert(std::is_same_v<typename std::move_iterator<bidirectional_iterator<char*>>::iterator_concept, std::input_iterator_tag>);
-  static_assert(std::is_same_v<typename std::move_iterator<random_access_iterator<char*>>::iterator_concept, std::input_iterator_tag>);
-  static_assert(std::is_same_v<typename std::move_iterator<contiguous_iterator<char*>>::iterator_concept, std::input_iterator_tag>);
-  static_assert(std::is_same_v<typename std::move_iterator<char*>::iterator_concept, std::input_iterator_tag>);
+  static_assert(std::is_same_v<typename std::move_iterator<forward_iterator<char*>>::iterator_concept, std::forward_iterator_tag>);
+  static_assert(std::is_same_v<typename std::move_iterator<bidirectional_iterator<char*>>::iterator_concept, std::bidirectional_iterator_tag>);
+  static_assert(std::is_same_v<typename std::move_iterator<random_access_iterator<char*>>::iterator_concept, std::random_access_iterator_tag>);
+  static_assert(std::is_same_v<typename std::move_iterator<contiguous_iterator<char*>>::iterator_concept, std::random_access_iterator_tag>);
+  static_assert(std::is_same_v<typename std::move_iterator<char*>::iterator_concept, std::random_access_iterator_tag>);
 #endif
 
   return 0;
 }