Skip to content

fix setindex(::ReinterpretArray,...) for zero-d arrays #58868

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

Merged
merged 6 commits into from
Jul 3, 2025
Merged

fix setindex(::ReinterpretArray,...) for zero-d arrays #58868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9b2484
fix `setindex(::ReinterpretArray,...)` for zero-d arrays
mbauman Jul 1, 2025
fbce0fa
also test 2 indices
mbauman Jul 1, 2025
b9f1543
use `firstindex` instead of `1`
mbauman Jul 1, 2025
d0e3cee
make corresponding `firstindex` change to `getindex`
mbauman Jul 1, 2025
eafa741
fixup! also test 2 indices
mbauman Jul 1, 2025
114a5a3
Merge branch 'master' into mb/zero-dim-reinterp-setindex
adienes Jul 3, 2025
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
4 changes: 2 additions & 2 deletions base/reinterpretarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ end
# Convert to full indices here, to avoid needing multiple conversions in
# the loop in _getindex_ra
inds = _to_subscript_indices(a, i)
isempty(inds) ? _getindex_ra(a, 1, ()) : _getindex_ra(a, inds[1], tail(inds))
isempty(inds) ? _getindex_ra(a, firstindex(a), ()) : _getindex_ra(a, inds[1], tail(inds))
end

@propagate_inbounds function getindex(a::ReshapedReinterpretArray{T,N,S}, ind::SCartesianIndex2) where {T,N,S}
Expand Down Expand Up @@ -556,7 +556,7 @@ end
return _setindex_ra!(a, v, i, ())
end
inds = _to_subscript_indices(a, i)
_setindex_ra!(a, v, inds[1], tail(inds))
isempty(inds) ? _setindex_ra!(a, v, firstindex(a), ()) : _setindex_ra!(a, v, inds[1], tail(inds))
end

@propagate_inbounds function setindex!(a::ReshapedReinterpretArray{T,N,S}, v, ind::SCartesianIndex2) where {T,N,S}
Expand Down
10 changes: 10 additions & 0 deletions test/reinterpretarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,16 @@ test_many_wrappers(A3) do A3_
@test A3[2,1,2] == 400
end

test_many_wrappers(C) do Cr
r = reinterpret(reshape, Tuple{Int, Int}, Cr)
r[] = (2,2)
@test r[] === (2,2)
r[1] = (3,3)
@test r[1] === (3,3)
r[1,1] = (4,4)
@test r[1,1] === (4,4)
end

# same-size reinterpret where one of the types is non-primitive
let a = NTuple{4,UInt8}[(0x01,0x02,0x03,0x04)]
test_many_wrappers(a, (identity, wrapper, fcviews)) do a_
Expand Down