Merge pull request #564 from YingboMa/inbounds

Use `propagate_inbounds` to ensure bounds check elision

Author: tkoolen

src/MArray.jl

@@ -122,7 +122,7 @@ end
     v.data[i]
 end
 
-@inline function setindex!(v::MArray, val, i::Int)
+@propagate_inbounds function setindex!(v::MArray, val, i::Int)
     @boundscheck checkbounds(v,i)
     T = eltype(v)
 

src/SOneTo.jl

@@ -19,11 +19,11 @@ Base.axes(s::SOneTo) = (s,)
 Base.size(s::SOneTo) = (length(s),)
 Base.length(s::SOneTo{n}) where {n} = n
 
-function Base.getindex(s::SOneTo, i::Int)
+@propagate_inbounds function Base.getindex(s::SOneTo, i::Int)
     @boundscheck checkbounds(s, i)
     return i
 end
-function Base.getindex(s::SOneTo, s2::SOneTo)
+@propagate_inbounds function Base.getindex(s::SOneTo, s2::SOneTo)
     @boundscheck checkbounds(s, s2)
     return s2
 end

src/Scalar.jl

@@ -15,7 +15,7 @@ end
 @inline convert(::Type{SA}, sa::SA) where {SA <: Scalar} = sa
 
 getindex(v::Scalar) = v.data[1]
-@inline function getindex(v::Scalar, i::Int)
+@propagate_inbounds function getindex(v::Scalar, i::Int)
     @boundscheck if i != 1
         error("Attempt to index Scalar at index $i")
     end

src/broadcast.jl

@@ -182,7 +182,7 @@ end
     end
 
     return quote
-        @_inline_meta
+        @_propagate_inbounds_meta
         @boundscheck sizematch($(Size{newsize}()), dest) || throw(DimensionMismatch("array could not be broadcast to match destination"))
         @inbounds $(Expr(:block, exprs...))
         return dest

src/convert.jl

@@ -3,7 +3,7 @@
 
 @inline (::Type{SA})(x...) where {SA <: StaticArray} = SA(x)
 @inline (::Type{SA})(a::StaticArray) where {SA<:StaticArray} = SA(Tuple(a))
-@inline (::Type{SA})(a::AbstractArray) where {SA <: StaticArray} = convert(SA, a)
+@propagate_inbounds (::Type{SA})(a::AbstractArray) where {SA <: StaticArray} = convert(SA, a)
 
 # this covers most conversions and "statically-sized reshapes"
 @inline convert(::Type{SA}, sa::StaticArray) where {SA<:StaticArray} = SA(Tuple(sa))
@@ -17,7 +17,7 @@
     throw(DimensionMismatch("expected input array of length $(length(SA)), got length $(length(a))"))
 end
 
-@inline function convert(::Type{SA}, a::AbstractArray) where {SA <: StaticArray}
+@propagate_inbounds function convert(::Type{SA}, a::AbstractArray) where {SA <: StaticArray}
     @boundscheck if length(a) != length(SA)
         dimension_mismatch_fail(SA, a)
     end

src/deque.jl

@@ -26,7 +26,7 @@ end
               i == newlen ? :(ifelse($i == index, x, vec[$i-1])) :
               :(ifelse($i < index, vec[$i], ifelse($i == index, x, vec[$i-1])))) for i = 1:newlen]
     return quote
-        @_inline_meta
+        @_propagate_inbounds_meta
         @boundscheck if (index < 1 || index > $newlen)
             throw(BoundsError(vec, index))
         end
@@ -60,7 +60,7 @@ end
     newlen = s[1] - 1
     exprs = [:(ifelse($i < index, vec[$i], vec[$i+1])) for i = 1:newlen]
     return quote
-        @_inline_meta
+        @_propagate_inbounds_meta
         @boundscheck if (index < 1 || index > $(s[1]))
             throw(BoundsError(vec, index))
         end

src/indexing.jl

@@ -9,7 +9,7 @@ setindex!(a::StaticArray, value, i::Int) = error("setindex!(::$(typeof(a)), valu
 # Note: all indexing behavior defaults to dense, linear indexing
 
 @propagate_inbounds function getindex(a::StaticArray, inds::Int...)
-    @boundscheck checkbounds(a, inds...) 
+    @boundscheck checkbounds(a, inds...)
     _getindex_scalar(Size(a), a, inds...)
 end
 
@@ -31,7 +31,7 @@ end
 end
 
 @propagate_inbounds function setindex!(a::StaticArray, value, inds::Int...)
-    @boundscheck checkbounds(a, inds...) 
+    @boundscheck checkbounds(a, inds...)
     _setindex!_scalar(Size(a), a, value, inds...)
 end