Speed up indices for SubArray

JuliaLang · Aug 28, 2016 · 8a70e13 · 8a70e13
1 parent 379c248
commit 8a70e13
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/base/subarray.jl b/base/subarray.jl
@@ -273,11 +273,20 @@ end
 # they are taken from the range/vector
 # Since bounds-checking is performance-critical and uses
 # indices, it's worth optimizing these implementations thoroughly
-indices(S::SubArray) = (@_inline_pure_meta; _indices_sub(S, indices(S.parent), S.indexes...))
+indices(S::SubArray) = (@_inline_meta; _indices_sub(S, indices(S.parent), S.indexes...))
 _indices_sub(S::SubArray, pinds) = ()
-_indices_sub(S::SubArray, pinds, ::Real, I...) = _indices_sub(S, tail(pinds), I...)
-_indices_sub(S::SubArray, pinds, ::Colon, I...) = (pinds[1], _indices_sub(S, tail(pinds), I...)...)
-_indices_sub(S::SubArray, pinds, i1::AbstractArray, I...) = (unsafe_indices(i1)..., _indices_sub(S, tail(pinds), I...)...)
+function _indices_sub(S::SubArray, pinds, ::Real, I...)
+    @_inline_meta
+    _indices_sub(S, tail(pinds), I...)
+end
+function _indices_sub(S::SubArray, pinds, ::Colon, I...)
+    @_inline_meta
+    (pinds[1], _indices_sub(S, tail(pinds), I...)...)
+end
+function _indices_sub(S::SubArray, pinds, i1::AbstractArray, I...)
+    @_inline_meta
+    (unsafe_indices(i1)..., _indices_sub(S, tail(pinds), I...)...)
+end
 
 ## Compatability
 # deprecate?