From dc249f8f1cb434cdc04359fd1f9eddc796fa715d Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Tue, 13 Oct 2026 16:44:27 -0500 Subject: [PATCH 1/3] Avoid Julia 1.13 broadcast allocation regression --- src/structarray.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/structarray.jl b/src/structarray.jl index eba837be..06692b2a 100644 --- a/src/structarray.jl +++ b/src/structarray.jl @@ -642,7 +642,7 @@ end # for aliasing analysis during broadcast function Broadcast.broadcast_unalias(dest::StructArray, src::AbstractArray) - if dest === src || any(Base.Fix2(===, src), components(dest)) + if dest === src || any(Base.Fix2(===, src), values(components(dest))) # values() works around Julia 1.13 allocation regression return src else return Base.unalias(dest, src) From 1c11f4c6b0a8677cb767bc2b3ce903efbf028adb Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Tue, 13 Oct 2026 17:05:55 -0500 Subject: [PATCH 2/3] Resolve Julia 1.13 shape dispatch ambiguities --- ext/StructArraysStaticArraysExt.jl | 8 ++++++-- src/structarray.jl | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ext/StructArraysStaticArraysExt.jl b/ext/StructArraysStaticArraysExt.jl index a02ead7e..503fc248 100644 --- a/ext/StructArraysStaticArraysExt.jl +++ b/ext/StructArraysStaticArraysExt.jl @@ -1,7 +1,7 @@ module StructArraysStaticArraysExt using StructArrays -using StaticArrays: StaticArray, FieldArray, tuple_prod, SVector, MVector, SOneTo +using StaticArrays: StaticArray, FieldArray, tuple_prod, SVector, MVector, SOneTo, HeterogeneousShapeTuple """ StructArrays.staticschema(::Type{<:StaticArray{S, T}}) where {S, T} @@ -41,7 +41,11 @@ StructArrays.component(s::FieldArray, i) = getfield(s, i) StructArrays.createinstance(T::Type{<:FieldArray}, args...) = StructArrays.createinstance_generic(T, args...) # disambiguation -Base.similar(s::StructArray, S::Type, sz::Tuple{Union{Integer, Base.OneTo, SOneTo}, Vararg{Union{Union{Integer, Base.OneTo, SOneTo}}}}) = StructArrays._similar(s, S, sz) +let shape = isdefined(Base, :AbstractOneTo) && SOneTo <: Base.AbstractOneTo ? + Tuple{SOneTo, Vararg{SOneTo}} : HeterogeneousShapeTuple + @eval Base.similar(s::StructArray, ::Type{T}, sz::$shape) where T = StructArrays._similar(s, T, sz) + @eval Base.similar(::Type{<:StructArray{T, N, C}}, sz::$shape) where {T, N, C} = StructArrays.buildfromschema(typ -> similar(typ, sz), T, C) +end Base.reshape(s::StructArray{T}, d::Tuple{SOneTo, Vararg{SOneTo}}) where {T} = StructArray{T}(map(x -> reshape(x, d), StructArrays.components(s))) # Broadcast overload diff --git a/src/structarray.jl b/src/structarray.jl index 06692b2a..2b07a517 100644 --- a/src/structarray.jl +++ b/src/structarray.jl @@ -290,7 +290,9 @@ for type in ( :(Tuple{Union{Integer, AbstractUnitRange}, Vararg{Union{Integer, AbstractUnitRange}}}), # disambiguation with Base :(Tuple{Union{Integer, Base.OneTo}, Vararg{Union{Integer, Base.OneTo}}}), - :(Tuple{Integer, Vararg{Integer}}), + isdefined(Base, :AbstractOneTo) ? + :(Tuple{Union{Integer, Base.AbstractOneTo}, Vararg{Union{Integer, Base.AbstractOneTo}}}) : + :(Tuple{Integer, Vararg{Integer}}), ) @eval function Base.similar(::Type{<:StructArray{T, N, C}}, sz::$(type)) where {T, N, C} return buildfromschema(typ -> similar(typ, sz), T, C) @@ -492,7 +494,9 @@ for type in ( :(Tuple{Integer, Vararg{Integer}}), :(Tuple{Union{Integer, Base.OneTo}, Vararg{Union{Integer, Base.OneTo}}}), :(Tuple{Union{Colon, Integer}, Vararg{Union{Colon, Integer}}}), - :(Tuple{Vararg{Union{Colon, Int}}}), + isdefined(Base, :AbstractOneTo) ? + :(Tuple{Union{Integer, Base.AbstractOneTo}, Vararg{Union{Integer, Base.AbstractOneTo}}}) : + :(Tuple{Vararg{Union{Colon, Int}}}), :(Tuple{Colon}), ) @eval function Base.reshape(s::StructArray{T}, d::$(type)) where {T} From 3727b71e9646ce99b22dd0b2aa66bf707367ccfb Mon Sep 17 00:00:00 2001 From: Alexander Plavin Date: Tue, 13 Oct 2026 17:13:45 -0500 Subject: [PATCH 3/3] Test type-based similar with static axes --- test/runtests.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/test/runtests.jl b/test/runtests.jl index 905bcfa4..d97b89b5 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1534,6 +1534,7 @@ end # potential ambiguities x = StructArray((SA[1,2], SA[1,2])) @test eltype(similar(x)::StructArray) == eltype(x) + @test eltype(similar(typeof(x), axes(x))::StructArray) == eltype(x) @test map(x->x, x)::StructArray == x @test size(reshape(x, (SOneTo(2), SOneTo(1)))::StructArray) == (2, 1) end