Merge pull request #185 from DilumAluthge/dpa/avx-coverage

Try to fix a bug in code coverage

Author: chriselrod

src/condense_loopset.jl

@@ -319,13 +319,14 @@ function setup_call_debug(ls::LoopSet)
     pushpreamble!(ls, generate_call(ls, (zero(Int8),zero(Int8),zero(Int8)), true))
     Expr(:block, ls.prepreamble, ls.preamble)
 end
-function setup_call(ls::LoopSet, q = nothing, inline::Int8 = zero(Int8), check_empty::Bool = false, u₁::Int8 = zero(Int8), u₂::Int8 = zero(Int8))
+function setup_call(ls::LoopSet, q::Expr, source::LineNumberNode, inline::Int8 = zero(Int8), check_empty::Bool = false, u₁::Int8 = zero(Int8), u₂::Int8 = zero(Int8))
     # We outline/inline at the macro level by creating/not creating an anonymous function.
     # The old API instead was based on inlining or not inline the generated function, but
     # the generated function must be inlined into the initial loop preamble for performance reasons.
     # Creating an anonymous function and calling it also achieves the outlining, while still
     # inlining the generated function into the loop preamble.
     lnns = extract_all_lnns(q)
+    pushfirst!(lnns, source)
     call = setup_call_inline(ls, inline, u₁, u₂)
     call = check_empty ? check_if_empty(ls, call) : call
     isnothing(q) && return Expr(:block, ls.prepreamble, call)

src/constructors.jl

@@ -145,7 +145,7 @@ macro avx(q)
     q = macroexpand(__module__, q)
     isa(q, Expr) || return q
     q2 = if q.head === :for
-        setup_call(LoopSet(q, __module__), q)
+        setup_call(LoopSet(q, __module__), q, __source__)
     else# assume broadcast
         substitute_broadcast(q, Symbol(__module__))
     end
@@ -204,22 +204,22 @@ macro avx(arg, q)
     q = macroexpand(__module__, q)
     inline, check_empty, u₁, u₂ = check_macro_kwarg(arg)
     ls = LoopSet(q, __module__)
-    esc(setup_call(ls, q, inline, check_empty, u₁, u₂))
+    esc(setup_call(ls, q, __source__, inline, check_empty, u₁, u₂))
 end
 macro avx(arg1, arg2, q)
     @assert q.head === :for
     q = macroexpand(__module__, q)
     inline, check_empty, u₁, u₂ = check_macro_kwarg(arg1)
     inline, check_empty, u₁, u₂ = check_macro_kwarg(arg2, inline, check_empty, u₁, u₂)
-    esc(setup_call(LoopSet(q, __module__), q, inline, check_empty, u₁, u₂))
+    esc(setup_call(LoopSet(q, __module__), q, __source__, inline, check_empty, u₁, u₂))
 end
 macro avx(arg1, arg2, arg3, q)
     @assert q.head === :for
     q = macroexpand(__module__, q)
     inline, check_empty, u₁, u₂ = check_macro_kwarg(arg1)
     inline, check_empty, u₁, u₂ = check_macro_kwarg(arg2, inline, check_empty, u₁, u₂)
     inline, check_empty, u₁, u₂ = check_macro_kwarg(arg3, inline, check_empty, u₁, u₂)
-    esc(setup_call(LoopSet(q, __module__), q, inline, check_empty, u₁, u₂))
+    esc(setup_call(LoopSet(q, __module__), q, __source__, inline, check_empty, u₁, u₂))
 end