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

Propagate inbounds in isassigned with CartesianIndex indices #53305

Merged
merged 5 commits into from
Feb 16, 2024
Merged

Propagate inbounds in isassigned with CartesianIndex indices #53305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77d1775
Propagate inbounds in isassigned with CartesianIndex indices
jishnub Feb 12, 2024
a2199ad
Split isassigned methods and inline one with Integer indices
jishnub Feb 13, 2024
ee74094
Test for zero args
jishnub Feb 13, 2024
e6f25b9
Test for Bools
jishnub Feb 15, 2024
71029c9
Ensure that isassigned throws for Bool indices
jishnub Feb 15, 2024
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
20 changes: 12 additions & 8 deletions base/multidimensional.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1565,19 +1565,23 @@ end
end
end

isassigned(a::AbstractArray, i::CartesianIndex) = isassigned(a, Tuple(i)...)
function isassigned(A::AbstractArray, i::Union{Integer, CartesianIndex}...)
isa(i, Tuple{Vararg{Int}}) || return isassigned(A, CartesianIndex(to_indices(A, i)))
@boundscheck checkbounds(Bool, A, i...) || return false
@propagate_inbounds isassigned(A::AbstractArray, i::CartesianIndex) = isassigned(A, Tuple(i)...)
@propagate_inbounds function isassigned(A::AbstractArray, i::Union{Integer, CartesianIndex}...)
jishnub marked this conversation as resolved.
Show resolved Hide resolved
return isassigned(A, CartesianIndex(to_indices(A, i)))
end
@inline function isassigned(A::AbstractArray, i::Integer...)
# convert to valid indices, checking for Bool
inds = to_indices(A, i)
@boundscheck checkbounds(Bool, A, inds...) || return false
S = IndexStyle(A)
ninds = length(i)
ninds = length(inds)
if (isa(S, IndexLinear) && ninds != 1)
return @inbounds isassigned(A, _to_linear_index(A, i...))
return @inbounds isassigned(A, _to_linear_index(A, inds...))
elseif (!isa(S, IndexLinear) && ninds != ndims(A))
return @inbounds isassigned(A, _to_subscript_indices(A, i...)...)
return @inbounds isassigned(A, _to_subscript_indices(A, inds...)...)
else
try
A[i...]
A[inds...]
true
catch e
if isa(e, BoundsError) || isa(e, UndefRefError)
Expand Down
14 changes: 13 additions & 1 deletion test/abstractarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,12 +548,24 @@ function test_primitives(::Type{T}, shape, ::Type{TestAbstractArray}) where T
@test firstindex(B, 1) == firstindex(A, 1) == first(axes(B, 1))
@test firstindex(B, 2) == firstindex(A, 2) == first(axes(B, 2))

# isassigned(a::AbstractArray, i::Int...)
@test !isassigned(B)
# isassigned(a::AbstractArray, i::Integer...)
j = rand(1:length(B))
@test isassigned(B, j)
if T == T24Linear
@test !isassigned(B, length(B) + 1)
end
# isassigned(a::AbstractArray, i::CartesianIndex)
@test isassigned(B, first(CartesianIndices(B)))
ind = last(CartesianIndices(B))
@test !isassigned(B, ind + oneunit(ind))
# isassigned(a::AbstractArray, i::Union{Integer,CartesianIndex}...)
@test isassigned(B, Int16.(first.(axes(B)))..., CartesianIndex(1,1))
# Bool isn't a valid index
@test_throws ArgumentError isassigned(B, Bool.(first.(axes(B)))..., CartesianIndex(1,1))
@test_throws ArgumentError isassigned(B, Bool.(first.(axes(B)))...)
@test_throws ArgumentError isassigned(B, true)
@test_throws ArgumentError isassigned(B, false)

mbauman marked this conversation as resolved.
Show resolved Hide resolved
# reshape(a::AbstractArray, dims::Dims)
@test_throws DimensionMismatch reshape(B, (0, 1))
Expand Down