Skip to content

Remove redundant convert in _setindex! #56178

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
aviatesk merged 3 commits into from
Oct 16, 2024
Merged

Remove redundant convert in _setindex! #56178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a61f244
Remove redundant `convert` in `_setindex!`
giordano Oct 15, 2024
303d946
Inline `convert` in `setindex!(::Memory)`
giordano Oct 15, 2024
c7d8c87
Update base/genericmemory.jl
giordano Oct 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
4 changes: 2 additions & 2 deletions base/array.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,11 +999,11 @@ function setindex!(A::Array{T}, x, i1::Int, i2::Int, I::Int...) where {T}
x = x isa T ? x : convert(T, x)::T
return _setindex!(A, x, i1, i2, I...)
end
function _setindex!(A::Array{T}, x, i1::Int, i2::Int, I::Int...) where {T}
function _setindex!(A::Array{T}, x::T, i1::Int, i2::Int, I::Int...) where {T}
@inline
@_noub_if_noinbounds_meta
@boundscheck checkbounds(A, i1, i2, I...) # generally _to_linear_index requires bounds checking
memoryrefset!(memoryrefnew(A.ref, _to_linear_index(A, i1, i2, I...), false), x isa T ? x : convert(T,x)::T, :not_atomic, false)
memoryrefset!(memoryrefnew(A.ref, _to_linear_index(A, i1, i2, I...), false), x, :not_atomic, false)
return A
end

Expand Down
11 changes: 8 additions & 3 deletions base/genericmemory.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,18 @@ getindex(A::Memory, c::Colon) = copy(A)

## Indexing: setindex! ##

function setindex!(A::Memory{T}, x, i1::Int) where {T}
val = x isa T ? x : convert(T,x)::T
function _setindex!(A::Memory{T}, x::T, i1::Int) where {T}
ref = memoryrefnew(memoryref(A), i1, @_boundscheck)
memoryrefset!(ref, val, :not_atomic, @_boundscheck)
memoryrefset!(ref, x, :not_atomic, @_boundscheck)
return A
end

function setindex!(A::Memory{T}, x, i1::Int) where {T}
@_propagate_inbounds_meta
val = x isa T ? x : convert(T,x)::T
return _setindex!(A, val, i1)
end

function setindex!(A::Memory{T}, x, i1::Int, i2::Int, I::Int...) where {T}
@inline
@boundscheck (i2 == 1 && all(==(1), I)) || throw_boundserror(A, (i1, i2, I...))
Expand Down