Skip to content

Commit

Permalink
Revert "Add _unsetindex! methods for SubArrays and `CartesianInde…
Browse files Browse the repository at this point in the history
…x`es (#53383)"

This reverts commit 1a90409.

(cherry picked from commit f8a7496)
  • Loading branch information
KristofferC committed May 13, 2024
1 parent 2ec00d0 commit 37ac53e
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 89 deletions.
15 changes: 1 addition & 14 deletions base/abstractarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1452,20 +1452,7 @@ function _setindex!(::IndexCartesian, A::AbstractArray, v, I::Vararg{Int,M}) whe
r
end

function _unsetindex!(A::AbstractArray, i::Integer...)
@_propagate_inbounds_meta
_unsetindex!(A, map(to_index, i)...)
end

function _unsetindex!(A::AbstractArray{T}, i::Int...) where T
# this provides a fallback method which is a no-op if the element is already unassigned
# such that copying into an uninitialized object generally always will work,
# even if the specific custom array type has not implemented `_unsetindex!`
@inline
@boundscheck checkbounds(A, i...)
allocatedinline(T) || @inbounds(!isassigned(A, i...)) || throw(MethodError(_unsetindex!, (A, i...)))
return A
end
_unsetindex!(A::AbstractArray, i::Integer) = _unsetindex!(A, to_index(i))

"""
parent(A)
Expand Down
7 changes: 1 addition & 6 deletions base/array.jl
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,7 @@ function _unsetindex!(A::Array, i::Int)
@inbounds _unsetindex!(GenericMemoryRef(A.ref, i))
return A
end
function _unsetindex!(A::Array, i::Int...)
@inline
@boundscheck checkbounds(A, i...)
@inbounds _unsetindex!(A, _to_linear_index(A, i...))
return A
end


# TODO: deprecate this (aligned_sizeof and/or elsize and/or sizeof(Some{T}) are more correct)
elsize(::Type{A}) where {T,A<:Array{T}} = aligned_sizeof(T)
Expand Down
6 changes: 0 additions & 6 deletions base/multidimensional.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1610,12 +1610,6 @@ end
end
end

# _unsetindex
@propagate_inbounds function Base._unsetindex!(A::AbstractArray, i::CartesianIndex)
Base._unsetindex!(A, to_indices(A, (i,))...)
return A
end

## permutedims

## Permute array dims ##
Expand Down
19 changes: 0 additions & 19 deletions base/subarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -413,25 +413,6 @@ function isassigned(V::FastSubArray{<:Any, 1}, i::Int)
r
end

function _unsetindex!(V::FastSubArray, i::Int)
@inline
@boundscheck checkbounds(V, i)
@inbounds _unsetindex!(V.parent, _reindexlinear(V, i))
return V
end
function _unsetindex!(V::FastSubArray{<:Any,1}, i::Int)
@inline
@boundscheck checkbounds(V, i)
@inbounds _unsetindex!(V.parent, _reindexlinear(V, i))
return V
end
function _unsetindex!(V::SubArray{T,N}, i::Vararg{Int,N}) where {T,N}
@inline
@boundscheck checkbounds(V, i...)
@inbounds _unsetindex!(V.parent, reindex(V.indices, i)...)
return V
end

IndexStyle(::Type{<:FastSubArray}) = IndexLinear()
IndexStyle(::Type{<:SubArray}) = IndexCartesian()

Expand Down
44 changes: 0 additions & 44 deletions test/subarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1074,48 +1074,4 @@ end
@test !isassigned(v, 1, 2) # inbounds but not assigned
@test !isassigned(v, 3, 3) # out-of-bounds
end

@testset "_unsetindex!" begin
function test_unsetindex(A, B)
copyto!(A, B)
for i in eachindex(A)
@test !isassigned(A, i)
end
inds = eachindex(A)
@test_throws BoundsError Base._unsetindex!(A, last(inds) + oneunit(eltype(inds)))
end
@testset "dest IndexLinear, src IndexLinear" begin
for p in (fill(BigInt(2)), BigInt[1, 2], BigInt[1 2; 3 4])
A = view(copy(p), ntuple(_->:, ndims(p))...)
B = view(similar(A), ntuple(_->:, ndims(p))...)
test_unsetindex(A, B)
test_unsetindex(p, B)
end
end

@testset "dest IndexLinear, src IndexCartesian" begin
for p in (fill(BigInt(2)), BigInt[1, 2], BigInt[1 2; 3 4])
A = view(copy(p), ntuple(_->:, ndims(p))...)
B = view(similar(A), axes(A)...)
test_unsetindex(A, B)
test_unsetindex(p, B)
end
end

@testset "dest IndexCartesian, src IndexLinear" begin
for p in (fill(BigInt(2)), BigInt[1, 2], BigInt[1 2; 3 4])
A = view(p, axes(p)...)
B = similar(A)
test_unsetindex(A, B)
end
end

@testset "dest IndexCartesian, src IndexCartesian" begin
for p in (fill(BigInt(2)), BigInt[1, 2], BigInt[1 2; 3 4])
A = view(p, axes(p)...)
B = view(similar(A), axes(A)...)
test_unsetindex(A, B)
end
end
end
end

0 comments on commit 37ac53e

Please sign in to comment.