ensure inbounds propagate (JuliaArrays#8)

Author: KristofferC

src/structarray.jl

@@ -38,7 +38,7 @@ Base.propertynames(s::StructArray) = fieldnames(typeof(columns(s)))
 
 Base.size(s::StructArray) = size(columns(s)[1])
 
-Base.getindex(s::StructArray, I::Int...) = get_ith(s, I...)
+Base.@propagate_inbounds Base.getindex(s::StructArray, I::Int...) = get_ith(s, I...)
 function Base.getindex(s::StructArray{T, N, C}, I::Union{Int, AbstractArray, Colon}...) where {T, N, C}
     StructArray{T}(map(v -> getindex(v, I...), columns(s)))
 end
@@ -47,7 +47,7 @@ function Base.view(s::StructArray{T, N, C}, I...) where {T, N, C}
     StructArray{T}(map(v -> view(v, I...), columns(s)))
 end
 
-Base.setindex!(s::StructArray, val, I::Int...) = set_ith!(s, val, I...)
+Base.@propagate_inbounds Base.setindex!(s::StructArray, val, I::Int...) = set_ith!(s, val, I...)
 
 fields(::Type{<:NamedTuple{K}}) where {K} = K
 fields(::Type{<:StructArray{T}}) where {T} = fields(T)

src/utils.jl

@@ -11,7 +11,10 @@ eltypes(::Type{NamedTuple{K, V}}) where {K, V} = eltypes(V)
         field = Expr(:., :s, Expr(:quote, key))
         push!(args, :($field[I...]))
     end
-    Expr(:call, :createinstance, :T, args...)
+    return quote
+        @boundscheck checkbounds(s, I...)
+        @inbounds $(Expr(:call, :createinstance, :T, args...))
+    end
 end
 
 @generated function set_ith!(s::StructArray{T}, vals, I...) where {T}
@@ -22,7 +25,10 @@ end
         push!(args, :($field[I...] = $val))
     end
     push!(args, :s)
-    Expr(:block, args...)
+    return quote
+        @boundscheck checkbounds(s, I...)
+        @inbounds $(Expr(:block, args...))
+    end
 end
 
 createinstance(::Type{T}, args...) where {T} = T(args...)

test/runtests.jl

@@ -7,6 +7,7 @@ using Test
     t = StructArray((a = a, b = b))
     @test (@inferred t[2,2]) == (a = 4, b = 7)
     @test (@inferred t[2,1:2]) == StructArray((a = [3, 4], b = [6, 7]))
+    @test_throws BoundsError t[3,3]
     @test (@inferred view(t, 2, 1:2)) == StructArray((a = view(a, 2, 1:2), b = view(b, 2, 1:2)))
 end