fix no_unique_address

Author: anonymouspc

libcxx/test/libcxx/ranges/range.adaptors/range.chunk/no_unique_address.compile.pass.cpp

@@ -22,35 +22,30 @@
 #include "test_iterators.h"
 #include "test_range.h"
 
-using input_view = std::views::all_t<test_range<cpp20_input_iterator>>;
+struct input_view {
+  cpp20_input_iterator<int*> begin() const;
+  sentinel_wrapper<cpp20_input_iterator<int*>> end() const;
+};
+template <> inline constexpr bool std::ranges::enable_view<input_view> = true;
 static_assert(std::ranges::input_range<input_view> && !std::ranges::forward_range<input_view>);
 
-struct forward_view : std::ranges::view_base {
-  std::string* begin() const;
-  std::string* end() const;
+struct forward_view {
+  int* begin() const;
+  int* end() const;
 };
+template <> inline constexpr bool std::ranges::enable_view<forward_view> = true;
 static_assert(std::ranges::forward_range<forward_view>);
-static_assert(std::is_reference_v<std::ranges::range_reference_t<forward_view>>);
-
-template <class View>
-struct Test {
-  [[no_unique_address]] View view;
-  unsigned char pad;
-};
 
 using CV1 = std::ranges::chunk_view<input_view>;
 // Expected CV1 (with View == input) layout:
-// [[no_unique_address]] _View __base_                                         // offset: 0
-// [[no_unique_address]] range_difference_t<_View> __n_                        // offset: sizeof(std::ptrdiff_t)
-// [[no_unique_address]] range_difference_t<_View> __remainder_                // offset: sizeof(std::ptrdiff_t)
-// [[no_unique_address]] __non_propagating_cache<iterator_t<_View>> __current_ // offset: ?
-// TODO: hmmm I'm a pure new C++ learner (having been exposed to C++ for 2 years)
-//       and I do not know about the memory layout here too...
-//       What is the layout like?
+// [[no_unique_address]] _View __base_                                         // size: 0
+// [[no_unique_address]] range_difference_t<_View> __n_                        // size: sizeof(ptrdiff_t)
+// [[no_unique_address]] range_difference_t<_View> __remainder_                // size: sizeof(ptrdiff_t)
+// [[no_unique_address]] __non_propagating_cache<iterator_t<_View>> __current_ // size: sizeof(__non_propagating_cache<cpp20_input_iterator<int*>>), align: std::ptrdiff_t
+static_assert(sizeof(CV1) == /*sizeof(__base_) == 0 + */ sizeof(std::ptrdiff_t) * 2 + sizeof(std::ranges::__non_propagating_cache<cpp20_input_iterator<int*>>));
 
 using CV2 = std::ranges::chunk_view<forward_view>;
 // Expected CV2 (with View >= forward) layout:
-// [[no_unique_address]] _View __base_             // offset: 0
-// [[no_unique_address]] range_difference_t<_View> // offset: sizeof(std::ptrdiff_t)
-static_assert(sizeof(CV2) == sizeof(std::ptrdiff_t));
-static_assert(sizeof(Test<CV2>) == sizeof(std::ptrdiff_t) * 2);
+// [[no_unique_address]] _View __base_             // size: 0
+// [[no_unique_address]] range_difference_t<_View> // size: sizeof(ptrdiff_t)
+static_assert(sizeof(CV2) == /*sizeof(__base_) == 0 + */ sizeof(std::ptrdiff_t));