Fix a ReshapedArray indexing performance regression

JuliaLang · Mar 19, 2015 · 3ad4b2d · 3ad4b2d
1 parent 4c17ea3
commit 3ad4b2d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/base/reshapedarray.jl b/base/reshapedarray.jl
@@ -118,14 +118,19 @@ stagedfunction getindex{T,N,P,I}(A::ReshapedArray{T,N,P,I}, indexes::Real...)
         for i = 1:npc[end]
             j = findlast(npc .< i)
             di = i - npc[j]
-            push!(argsout, Expr(:..., :(tindex[$j][$di])))
+            push!(argsout, :(tindex[$j][$di]))
+        end
+    else
+        for i = 1:npc[end]
+            push!(argsout, :(tindex[$i]))
         end
     end
     meta = Expr(:meta, :inline)
     ex = length(argsin) == 1 ?
         quote
             $meta
-            getindex(A.parent, $(argsin...)...)
+            tindex = $(argsin...)
+            getindex(A.parent, $(argsout...))
         end :
         quote
             $meta