Fix a ReshapedArray indexing performance regression

JuliaLang · Mar 20, 2015 · f5905b1 · f5905b1
1 parent 4c17ea3
commit f5905b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 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

diff --git a/test/reshapedarray.jl b/test/reshapedarray.jl
@@ -33,7 +33,6 @@ CC = reshape([1:16;], (2,4,2))
 @test isa(CC, Array)
 
 for AT in (ArrayLF, ArrayLS)
-    @show AT
     A = reshape(AT([1:15;]), (3, 5))
     @test indextype(A) <: (Reshaped.IndexMD{1,2},)
     @test A == AA