Don't splat into Expr.

Author: chriselrod

src/add_ifelse.jl

@@ -59,7 +59,7 @@ function add_andblock!(ls::LoopSet, condexpr::Expr, condeval::Expr, elementbytes
     if condeval.head === :call
         @assert first(condeval.args) === :setindex!
         array, raw_indices = ref_from_setindex!(ls, condeval)
-        ref = Expr(:ref, array, raw_indices...)
+        ref = Expr(:ref, array); append!(ref.args, raw_indices)
         return add_andblock!(ls, condop, ref, condeval.args[3], elementbytes, position)
     end
     @assert condeval.head === :(=)    
@@ -100,7 +100,8 @@ function add_orblock!(ls::LoopSet, condexpr::Expr, condeval::Expr, elementbytes:
     if condeval.head === :call
         @assert first(condeval.args) === :setindex!
         array, raw_indices = ref_from_setindex!(ls, condeval)
-        return add_orblock!(ls, condop, Expr(:ref, array, raw_indices...), condeval.args[3], elementbytes, position)
+        ref = Expr(:ref, array); append!(ref.args, raw_indices)
+        return add_orblock!(ls, condop, ref, condeval.args[3], elementbytes, position)
     end
     @assert condeval.head === :(=)
     @assert length(condeval.args) == 2

src/broadcast.jl

@@ -128,7 +128,8 @@ function LowDimArray{D}(data::A) where {D,T,N,A <: AbstractArray{T,N}}
 end
 function extract_all_1_array!(ls::LoopSet, bcname::Symbol, N::Int, elementbytes::Int)
     refextract = gensym(bcname)
-    pushpreamble!(ls, Expr(:(=), refextract, Expr(:ref, bcname, [1 for n ∈ 1:N]...)))
+    ref = Expr(:ref, bcname); append!(ref.args, [1 for n ∈ 1:N])
+    pushpreamble!(ls, Expr(:(=), refextract, ref))
     return add_constant!(ls, refextract, elementbytes) # or replace elementbytes with sizeof(T) ? u
 end
 function add_broadcast!(

src/costs.jl

@@ -18,15 +18,18 @@ struct Instruction
 end
 # lower(instr::Instruction) = Expr(:(.), instr.mod, QuoteNode(instr.instr))
 # Base.convert(::Type{Expr}, instr::Instruction) = Expr(:(.), instr.mod, QuoteNode(instr.instr))
-function Base.Expr(instr::Instruction, args...)
+function callexpr(instr::Instruction)
     if instr.mod === :LoopVectorization
-        Expr(:call, lv(instr.instr), args...)::Expr
+        Expr(:call, lv(instr.instr))
     else#if instr.mod === :Main
-        Expr(:call, instr.instr, args...)::Expr
-    # else
-        # Expr(:call, convert(Expr, instr), args...)::Expr
+        Expr(:call, instr.instr)
     end
 end
+function callexpr(instr::Instruction, arg)
+    ce = callexpr(instr)
+    append!(ce.args, arg)
+    ce
+end
 Base.hash(instr::Instruction, h::UInt64) = hash(instr.instr, hash(instr.mod, h))
 # function Base.isless(instr1::Instruction, instr2::Instruction)
 #     if instr1.mod === instr2.mod

src/lower_compute.jl

@@ -200,7 +200,7 @@ function lower_compute!(
     isvectorized = vectorized ∈ loopdependencies(op)
     modsuffix = 0
     for u ∈ 0:Uiter
-        instrcall = Expr(instr) # Expr(:call, instr)
+        instrcall = callexpr(instr)
         varsym = if tiledouterreduction > 0 # then suffix !== nothing
             modsuffix = ((u + suffix*(Uiter + 1)) & 3)
             # modsuffix = u

src/lower_store.jl

@@ -45,16 +45,25 @@ end
 function reduce_range!(q::Expr, toreduct::Symbol, instr::Instruction, Uh::Int, Uh2::Int)
     if 2Uh == Uh2
         for u ∈ 0:2:Uh2-1
-            push!(q.args, Expr(:(=), Symbol(toreduct, (u>>>1)), Expr(instr, Symbol(toreduct, u), Symbol(toreduct, u + 1))))
+            instrexpr = callexpr(instr)
+            push!(instrexpr.args, Symbol(toreduct, u))
+            push!(instrexpr.args, Symbol(toreduct, u + 1))
+            push!(q.args, Expr(:(=), Symbol(toreduct, (u>>>1)), instrexpr))
         end
     else
         for u ∈ Uh:Uh2-1
             tru = Symbol(toreduct, u - Uh)
-            push!(q.args, Expr(:(=), tru, Expr(instr, tru, Symbol(toreduct, u))))
+            instrexpr = callexpr(instr)
+            push!(instrexpr.args, tru)
+            push!(instrexpr.args, Symbol(toreduct, u))
+            push!(q.args, Expr(:(=), tru, instrexpr))
         end
         for u ∈ 2Uh:Uh2-1
             tru = Symbol(toreduct, u - 2Uh)
-            push!(q.args, Expr(:(=), tru, Expr(instr, tru, Symbol(toreduct, u))))
+            instrexpr = callexpr(instr)
+            push!(instrexpr.args, tru)
+            push!(instrexpr.args, Symbol(toreduct, u))
+            push!(q.args, Expr(:(=), tru, instrexpr))
         end
     end
 end

src/lowering.jl

@@ -241,7 +241,9 @@ function lower_no_unroll(ls::LoopSet, us::UnrollSpecification, n::Int, inclmask:
             # Expr(:block, loopiteratesatleastonce(loop, true), Expr(:while, expect(tc), body))
         Expr(:block, Expr(:while, isstatic ? tc : expect(tc), body))
     elseif isstatic && length(loop) ≤ 8
-        Expr(:block, (body for _ ∈ 1:length(loop))...)
+        bodyq = Expr(:block)
+        foreach(_ -> push!(bodyq.args, body), 1:length(loop))
+        bodyq
     else
         termcond = gensym(:maybeterm)
         push!(body.args, Expr(:(=), termcond, isstatic ? tc : expect(tc)))

src/operations.jl

@@ -242,11 +242,13 @@ function Base.show(io::IO, op::Operation)
             print(io, Expr(:(=), op.variable, op.instruction.instr))
         end
     elseif isload(op)
-        print(io, Expr(:(=), op.variable, Expr(:ref, name(op.ref), getindices(op)...)))
+        ref = Expr(:ref, name(op.ref)); append!(ref.args, getindices(op))
+        print(io, Expr(:(=), op.variable, ref))
     elseif iscompute(op)
-        print(io, Expr(:(=), op.variable, Expr(op.instruction, name.(parents(op))...)))
+        print(io, Expr(:(=), op.variable, callexpr(op.instruction, map(name, parents(op)))))
     elseif isstore(op)
-        print(io, Expr(:(=), Expr(:ref, name(op.ref), getindices(op)...), name(first(parents(op)))))
+        ref = Expr(:ref, name(op.ref)); append!(ref.args, getindices(op))
+        print(io, Expr(:(=), ref, name(first(parents(op)))))
     elseif isloopvalue(op)
         print(io, Expr(:(=), op.variable, op.variable))
     end