Skip to content

Commit

Permalink
[libc][cpp] reverse_iterator support (#85702)
Browse files Browse the repository at this point in the history
Towards the goal of implementing __cxa_finalize (#85651) I'd like to be able to
reverse iterate over cpp::arrays such as the one used in FixedVector.

Implement the enough iterator support to be able to iterate a cpp::array in
reverse, and add tests.

Of note, reverse iterator's begin() refers to forward iterator's end() (and
vice versa). When dereferenced (operator*), the reverse iterator returns a copy
that's been pre-decremented (the underlying forward iterator is advanced).
  • Loading branch information
nickdesaulniers committed Mar 19, 2024
1 parent 252e255 commit c63a291
Show file tree
Hide file tree
Showing 4 changed files with 162 additions and 0 deletions.
23 changes: 23 additions & 0 deletions libc/src/__support/CPP/array.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_ARRAY_H
#define LLVM_LIBC_SRC___SUPPORT_CPP_ARRAY_H

#include "src/__support/CPP/iterator.h" // reverse_iterator
#include "src/__support/macros/attributes.h"
#include <stddef.h> // For size_t.

Expand All @@ -23,6 +24,8 @@ template <class T, size_t N> struct array {
using value_type = T;
using iterator = T *;
using const_iterator = const T *;
using reverse_iterator = cpp::reverse_iterator<iterator>;
using const_reverse_iterator = cpp::reverse_iterator<const_iterator>;

LIBC_INLINE constexpr T *data() { return Data; }
LIBC_INLINE constexpr const T *data() const { return Data; }
Expand All @@ -45,9 +48,29 @@ template <class T, size_t N> struct array {

LIBC_INLINE constexpr iterator begin() { return Data; }
LIBC_INLINE constexpr const_iterator begin() const { return Data; }
LIBC_INLINE constexpr const_iterator cbegin() const { return begin(); }

LIBC_INLINE constexpr iterator end() { return Data + N; }
LIBC_INLINE constexpr const_iterator end() const { return Data + N; }
LIBC_INLINE constexpr const_iterator cend() const { return end(); }

LIBC_INLINE constexpr reverse_iterator rbegin() {
return reverse_iterator{end()};
}
LIBC_INLINE constexpr const_reverse_iterator rbegin() const {
return const_reverse_iterator{end()};
}
LIBC_INLINE constexpr const_reverse_iterator crbegin() const {
return rbegin();
}

LIBC_INLINE constexpr reverse_iterator rend() {
return reverse_iterator{begin()};
}
LIBC_INLINE constexpr const_reverse_iterator rend() const {
return const_reverse_iterator{begin()};
}
LIBC_INLINE constexpr const_reverse_iterator crend() const { return rend(); }
};

} // namespace cpp
Expand Down
63 changes: 63 additions & 0 deletions libc/src/__support/CPP/iterator.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
//===-- Standalone implementation of iterator -------------------*- C++ -*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_ITERATOR_H
#define LLVM_LIBC_SRC___SUPPORT_CPP_ITERATOR_H

#include "src/__support/CPP/type_traits/enable_if.h"
#include "src/__support/CPP/type_traits/is_convertible.h"
#include "src/__support/CPP/type_traits/is_same.h"
#include "src/__support/macros/attributes.h"

namespace LIBC_NAMESPACE {
namespace cpp {

template <typename T> struct iterator_traits;
template <typename T> struct iterator_traits<T *> {
using reference = T &;
};

template <typename Iter> class reverse_iterator {
Iter current;

public:
using reference = typename iterator_traits<Iter>::reference;

LIBC_INLINE reverse_iterator() : current() {}
LIBC_INLINE constexpr explicit reverse_iterator(Iter it) : current(it) {}

template <typename Other,
cpp::enable_if_t<!cpp::is_same_v<Iter, Other> &&
cpp::is_convertible_v<const Other &, Iter>,
int> = 0>
LIBC_INLINE constexpr explicit reverse_iterator(const Other &it)
: current(it) {}

LIBC_INLINE constexpr reference operator*() const {
Iter tmp = current;
return *--tmp;
}
LIBC_INLINE constexpr reverse_iterator operator--() {
++current;
return *this;
}
LIBC_INLINE constexpr reverse_iterator &operator++() {
--current;
return *this;
}
LIBC_INLINE constexpr reverse_iterator operator++(int) {
reverse_iterator tmp(*this);
--current;
return tmp;
}
};

} // namespace cpp
} // namespace LIBC_NAMESPACE

#endif // LLVM_LIBC_SRC___SUPPORT_CPP_ITERATOR_H
10 changes: 10 additions & 0 deletions libc/test/src/__support/CPP/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
add_custom_target(libc-cpp-utils-tests)

add_libc_test(
array_test
SUITE
libc-cpp-utils-tests
SRCS
array_test.cpp
DEPENDS
libc.src.__support.CPP.array
)

add_libc_test(
bit_test
SUITE
Expand Down
66 changes: 66 additions & 0 deletions libc/test/src/__support/CPP/array_test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
//===-- Unittests for Array -----------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#include "src/__support/CPP/array.h"
#include "test/UnitTest/Test.h"

using LIBC_NAMESPACE::cpp::array;

TEST(LlvmLibcArrayTest, Basic) {
array<int, 3> a = {0, 1, 2};

ASSERT_EQ(a.data(), &a.front());
ASSERT_EQ(a.front(), 0);
ASSERT_EQ(a.back(), 2);
ASSERT_EQ(a.size(), size_t{3});
ASSERT_EQ(a[1], 1);
ASSERT_FALSE(a.empty());
ASSERT_NE(a.begin(), a.end());
ASSERT_EQ(*a.begin(), a.front());

auto it = a.rbegin();
ASSERT_EQ(*it, 2);
ASSERT_EQ(*(++it), 1);
ASSERT_EQ(*(++it), 0);

for (int &x : a)
ASSERT_GE(x, 0);
}

// Test const_iterator and const variant methods.
TEST(LlvmLibcArrayTest, Const) {
const array<int, 3> z = {3, 4, 5};

ASSERT_EQ(3, z.front());
ASSERT_EQ(4, z[1]);
ASSERT_EQ(5, z.back());
ASSERT_EQ(3, *z.data());

// begin, cbegin, end, cend
array<int, 3>::const_iterator it2 = z.begin();
ASSERT_EQ(*it2, z.front());
it2 = z.cbegin();
ASSERT_EQ(*it2, z.front());
it2 = z.end();
ASSERT_NE(it2, z.begin());
it2 = z.cend();
ASSERT_NE(it2, z.begin());

// rbegin, crbegin, rend, crend
array<int, 3>::const_reverse_iterator it = z.rbegin();
ASSERT_EQ(*it, z.back());
it = z.crbegin();
ASSERT_EQ(*it, z.back());
it = z.rend();
ASSERT_EQ(*--it, z.front());
it = z.crend();
ASSERT_EQ(*--it, z.front());

for (const int &x : z)
ASSERT_GE(x, 0);
}

0 comments on commit c63a291

Please sign in to comment.