Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ASAN failure in array.rend(). #219

Merged
merged 1 commit into from
Feb 3, 2025
Merged

Fix ASAN failure in array.rend(). #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 33 additions & 7 deletions runtime/cpp/emboss_array_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class ElementViewIterator {

explicit ElementViewIterator(const GenericArrayView array_view,
::std::ptrdiff_t index)
: array_view_(array_view), view_(array_view[index]), index_(index) {}
: array_view_(array_view), view_(array_view.at(index)), index_(index) {}

ElementViewIterator() = default;

Expand All @@ -66,7 +66,7 @@ class ElementViewIterator {

ElementViewIterator &operator+=(difference_type d) {
index_ += (kDirection == ElementViewIteratorDirection::kForward ? d : -d);
view_ = array_view_[index_];
view_ = array_view_.at(index_);
return *this;
}

Expand Down Expand Up @@ -178,9 +178,15 @@ class GenericArrayView final {
: parameters_{parameters...}, buffer_{buffer} {}

ElementView operator[](::std::size_t index) const {
return IndexOperatorHelper<sizeof...(ElementViewParameterTypes) ==
0>::ConstructElement(parameters_, buffer_,
index);
return IndexOperatorHelper<(sizeof...(ElementViewParameterTypes) ==
0)>::UncheckedConstructElement(parameters_,
buffer_, index);
}

ElementView at(::std::size_t index) const {
return IndexOperatorHelper<(sizeof...(ElementViewParameterTypes) ==
0)>::ConstructElement(parameters_, buffer_,
index, ElementCount());
}

ForwardIterator begin() const { return ForwardIterator(*this, 0); }
Expand Down Expand Up @@ -315,17 +321,37 @@ class GenericArrayView final {
template <bool, ::std::size_t... N>
struct IndexOperatorHelper {
static ElementView ConstructElement(
const ::std::tuple<ElementViewParameterTypes...> &parameters,
BufferType buffer, ::std::size_t index, ::std::size_t size) {
return IndexOperatorHelper<
(sizeof...(ElementViewParameterTypes) == 1 + sizeof...(N)), N...,
sizeof...(N)>::ConstructElement(parameters, buffer, index, size);
}

static ElementView UncheckedConstructElement(
const ::std::tuple<ElementViewParameterTypes...> &parameters,
BufferType buffer, ::std::size_t index) {
return IndexOperatorHelper<
sizeof...(ElementViewParameterTypes) == 1 + sizeof...(N), N...,
sizeof...(N)>::ConstructElement(parameters, buffer, index);
(sizeof...(ElementViewParameterTypes) == 1 + sizeof...(N)), N...,
sizeof...(N)>::UncheckedConstructElement(parameters, buffer, index);
}
};

template </**/ ::std::size_t... N>
struct IndexOperatorHelper<true, N...> {
static ElementView ConstructElement(
const ::std::tuple<ElementViewParameterTypes...> &parameters,
BufferType buffer, ::std::size_t index, ::std::size_t size) {
return ElementView(
::std::get<N>(parameters)...,
index < 0 || index >= size
? typename BufferType::template OffsetStorageType<kElementSize,
0>(nullptr)
: buffer.template GetOffsetStorage<kElementSize, 0>(
kElementSize * index, kElementSize));
}

static ElementView UncheckedConstructElement(
const ::std::tuple<ElementViewParameterTypes...> &parameters,
BufferType buffer, ::std::size_t index) {
return ElementView(::std::get<N>(parameters)...,
Expand Down