Skip to content

Commit

Permalink
Reinstate scalar multidimensional Array getindex
Browse files Browse the repository at this point in the history
The compiler is much better at hoisting bounds checks from `arrayref` than it is from user code like `checkbounds`.
  • Loading branch information
mbauman committed Apr 7, 2015
1 parent 93d5c6e commit 700a69b
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions base/array.jl
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,20 @@ done(a::Array,i) = (i > length(a))

## Indexing: getindex ##

getindex(A::Array, i::Int) = arrayref(A, i)
unsafe_getindex(A::Array, i::Int) = @inbounds return arrayref(A, i)
# While these are redundant with the abstract fallbacks, the compiler is much
# better at hoisting bounds checks from within arrayref than `checkbounds`
getindex(A::Array, i1::Int) = arrayref(A, i1)
getindex(A::Array, i1::Int, i2::Int) = arrayref(A, i1, i2)
getindex(A::Array, i1::Int, i2::Int, i3::Int) = arrayref(A, i1, i2, i3)
getindex(A::Array, i1::Int, i2::Int, i3::Int, i4::Int) = arrayref(A, i1, i2, i3, i4)
getindex(A::Array, i1::Int, i2::Int, i3::Int, i4::Int, i5::Int) = arrayref(A, i1, i2, i3, i4, i5)
getindex(A::Array, i1::Int, i2::Int, i3::Int, i4::Int, i5::Int, i6::Int, I::Int...) = arrayref(A, i1, i2, i3, i4, i5, i6, I...)
unsafe_getindex(A::Array, i1::Int) = @inbounds return arrayref(A, i1)
unsafe_getindex(A::Array, i1::Int, i2::Int) = @inbounds return arrayref(A, i1, i2)
unsafe_getindex(A::Array, i1::Int, i2::Int, i3::Int) = @inbounds return arrayref(A, i1, i2, i3)
unsafe_getindex(A::Array, i1::Int, i2::Int, i3::Int, i4::Int) = @inbounds return arrayref(A, i1, i2, i3, i4)
unsafe_getindex(A::Array, i1::Int, i2::Int, i3::Int, i4::Int, i5::Int) = @inbounds return arrayref(A, i1, i2, i3, i4, i5)
unsafe_getindex(A::Array, i1::Int, i2::Int, i3::Int, i4::Int, i5::Int, i6::Int, I::Int...) = @inbounds return arrayref(A, i1, i2, i3, i4, i5, i6, I...)

# Fast copy using copy! for UnitRange and Colon
# This will outperform abstract fallbacks, but disabled for now as a stress test
Expand Down

0 comments on commit 700a69b

Please sign in to comment.