Skip to content

[backport 1.11] Set array size only when safe to do so #58847

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

Closed
wants to merge 4 commits into from
Closed

[backport 1.11] Set array size only when safe to do so #58847

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5393290
set array size when safe to do so
MilesCranmer Jun 29, 2025
097edfe
Merge branch 'release-1.11' into fix-id-cold-3
MilesCranmer Jun 29, 2025
7942c6c
fix: remove unneccessary unsetindex
MilesCranmer Jun 29, 2025
da7604e
Merge branch 'fix-id-cold-3' of https://github.com/MilesCranmer/julia…
MilesCranmer Jun 29, 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
13 changes: 9 additions & 4 deletions base/array.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,10 +1067,10 @@ function _growbeg!(a::Vector, delta::Integer)
len = length(a)
offset = memoryrefoffset(ref)
newlen = len + delta
setfield!(a, :size, (newlen,))
# if offset is far enough advanced to fit data in existing memory without copying
if delta <= offset - 1
setfield!(a, :ref, @inbounds memoryref(ref, 1 - delta))
setfield!(a, :size, (newlen,))
else
@noinline (function()
@_terminates_locally_meta
Expand All @@ -1095,6 +1095,7 @@ function _growbeg!(a::Vector, delta::Integer)
unsafe_copyto!(newmem, newoffset + delta, mem, offset, len)
end
setfield!(a, :ref, @inbounds memoryref(newmem, newoffset))
setfield!(a, :size, (newlen,))
end)()
end
return
Expand All @@ -1110,7 +1111,6 @@ function _growend!(a::Vector, delta::Integer)
len = length(a)
newlen = len + delta
offset = memoryrefoffset(ref)
setfield!(a, :size, (newlen,))
newmemlen = offset + newlen - 1
if memlen < newmemlen
@noinline (function()
Expand All @@ -1132,7 +1132,10 @@ function _growend!(a::Vector, delta::Integer)
newref = @inbounds memoryref(newmem, newoffset)
unsafe_copyto!(newref, ref, len)
setfield!(a, :ref, newref)
setfield!(a, :size, (newlen,))
end)()
else
setfield!(a, :size, (newlen,))
end
return
end
Expand All @@ -1151,7 +1154,6 @@ function _growat!(a::Vector, i::Integer, delta::Integer)
memlen = length(mem)
newlen = len + delta
offset = memoryrefoffset(ref)
setfield!(a, :size, (newlen,))
newmemlen = offset + newlen - 1

# which side would we rather grow into?
Expand All @@ -1161,11 +1163,13 @@ function _growat!(a::Vector, i::Integer, delta::Integer)
newref = @inbounds memoryref(mem, offset - delta)
unsafe_copyto!(newref, ref, i)
setfield!(a, :ref, newref)
setfield!(a, :size, (newlen,))
for j in i:i+delta-1
@inbounds _unsetindex!(a, j)
end
elseif !prefer_start && memlen >= newmemlen
unsafe_copyto!(mem, offset - 1 + delta + i, mem, offset - 1 + i, len - i + 1)
setfield!(a, :size, (newlen,))
for j in i:i+delta-1
@inbounds _unsetindex!(a, j)
end
Expand All @@ -1179,6 +1183,7 @@ function _growat!(a::Vector, i::Integer, delta::Integer)
unsafe_copyto!(newref, ref, i-1)
unsafe_copyto!(newmem, newoffset + delta + i - 1, mem, offset + i - 1, len - i + 1)
setfield!(a, :ref, newref)
setfield!(a, :size, (newlen,))
end
end

Expand All @@ -1191,11 +1196,11 @@ function _deletebeg!(a::Vector, delta::Integer)
@inbounds _unsetindex!(a, i)
end
newlen = len - delta
setfield!(a, :size, (newlen,))
if newlen != 0 # if newlen==0 we could accidentally index past the memory
newref = @inbounds memoryref(a.ref, delta + 1)
setfield!(a, :ref, newref)
end
setfield!(a, :size, (newlen,))
return
end
function _deleteend!(a::Vector, delta::Integer)
Expand Down