Refactor insert_node_here macro

Author: serenity4

src/transform/tearing/schedule.jl

@@ -33,20 +33,22 @@ function find_eqs_vars(state::TransformationState)
     find_eqs_vars(state.structure.graph, compact)
 end
 
-function ir_add!(compact::IncrementalCompact, line, settings::Settings, @nospecialize(_a), @nospecialize(_b))
+function ir_add!(compact::IncrementalCompact, line, settings::Settings, @nospecialize(_a), @nospecialize(_b), source = nothing)
     a, b = _a, _b
     (b === nothing || b === 0.) && return _a
     (a === nothing || b === 0.) && return _b
-    idx = @insert_node_here compact line settings (a + b)::Any
+    source = @something(source, @__SOURCE__)
+    idx = _insert_node_here!(compact, line, settings, source, :($a + $b), Any)
     compact[idx][:flag] |= Compiler.IR_FLAG_REFINED
     idx
 end
 
-function ir_mul_const!(compact, line, settings, coeff::Float64, _a)
+function ir_mul_const!(compact, line, settings, coeff::Float64, _a, source = nothing)
     if isone(coeff)
         return _a
     end
-    idx = @insert_node_here compact line settings (coeff * _a)::Any
+    source = @something(source, @__SOURCE__)
+    idx = _insert_node_here!(compact, line, settings, source, :($coeff * $_a), Any)
     compact[idx][:flag] |= Compiler.IR_FLAG_REFINED
     return idx
 end
@@ -60,7 +62,7 @@ end
 
 function schedule_incidence!(compact, curval, incT::Const, var, line, settings; vars=nothing, schedule_missing_var! = nothing)
     if curval !== nothing
-        return (ir_add!(compact, line, settings, curval, incT.val), nothing)
+        return (ir_add!(compact, line, settings, curval, incT.val, @__SOURCE__), nothing)
     end
     return (incT.val, nothing)
 end
@@ -93,8 +95,8 @@ function schedule_incidence!(compact, curval, incT::Incidence, var, line, settin
             end
         end
 
-        acc = ir_mul_const!(compact, line, settings, coeff, lin_var_ssa)
-        curval = curval === nothing ? acc : ir_add!(compact, line, settings, curval, acc)
+        acc = ir_mul_const!(compact, line, settings, coeff, lin_var_ssa, @__SOURCE__)
+        curval = curval === nothing ? acc : ir_add!(compact, line, settings, curval, acc, @__SOURCE__)
     end
     (curval, _) = schedule_incidence!(compact, curval, incT.typ, var, line, settings; vars, schedule_missing_var!)
     return (curval, thiscoeff)
@@ -1085,7 +1087,7 @@ function tearing_schedule!(state::TransformationState, ci::CodeInstance, key::To
                                 this_nonlinearssa = SSAValue(eqcallssa.id)
                                 line = compact1[eqcallssa][:line]
                             end
-                            nonlinearssa = nonlinearssa === nothing ? this_nonlinearssa : ir_add!(compact1, line, settings, this_nonlinearssa, nonlinearssa)
+                            nonlinearssa = nonlinearssa === nothing ? this_nonlinearssa : ir_add!(compact1, line, settings, this_nonlinearssa, nonlinearssa, @__SOURCE__)
                         end
                         mapping = result.eq_callee_mapping[eq]
                         if mapping !== nothing
@@ -1113,7 +1115,7 @@ function tearing_schedule!(state::TransformationState, ci::CodeInstance, key::To
                     curval = nonlinearssa
                     (curval, thiscoeff) = schedule_incidence!(compact1, curval, incT, var, line, settings; vars=var_sols, schedule_missing_var!)
                     @assert isa(thiscoeff, Float64)
-                    curval = ir_mul_const!(compact1, line, settings, 1/thiscoeff, curval)
+                    curval = ir_mul_const!(compact1, line, settings, 1/thiscoeff, curval, @__SOURCE__)
                     var_sols[var] = isa(curval, SSAValue) ? CarriedSSAValue(ordinal, curval.id) : curval
                     insert_solved_var_here!(compact1, var, curval, line)
                 else

src/utils.jl

@@ -114,31 +114,44 @@ end
 """
 macro insert_node_here(compact, line, settings, ex, reverse_affinity = false)
     source = :(LineNumberNode($(__source__.line), $(QuoteNode(__source__.file))))
-    line = :($DAECompiler.maybe_insert_debuginfo!($compact, $settings, $source, $line, $compact.result_idx))
-    generate_insert_node_here(compact, line, ex, reverse_affinity)
+    generate_insert_node_here(compact, line, settings, ex, source, reverse_affinity)
 end
 
-function generate_insert_node_here(compact, line, ex, reverse_affinity)
+function generate_insert_node_here(compact, line, settings, ex, source, reverse_affinity)
     isexpr(ex, :(::), 2) || throw(ArgumentError("Expected type-annotated expression, got $ex"))
     ex, type = ex.args
-    if isexpr(ex, :call) && isa(ex.args[1], QuoteNode)
-        # The called "function" is a non-call `Expr` head
-        ex = Expr(ex.args[1].value, ex.args[2:end]...)
-    end
     compact = esc(compact)
+    settings = esc(settings)
     line = esc(line)
+    inst_ex = esc(process_inst_expr(ex))
     type = esc(type)
-    if isa(ex, Symbol)
-        inst_ex = ex
-    elseif isexpr(ex, :return)
-        inst_ex = :(ReturnNode($(ex.args...)))
-    else
-        inst_ex = :(Expr($(QuoteNode(ex.head)), $(ex.args...)))
-    end
-    return quote
-        inst = NewInstruction($(esc(inst_ex)), $type, $line)
-        insert_node_here!($compact, inst, $(esc(reverse_affinity)))
+    return :(_insert_node_here!($compact, $line, $settings, $source, $inst_ex, $type; reverse_affinity = $reverse_affinity))
+end
+
+function process_inst_expr(ex)
+    if isexpr(ex, :call) && isa(ex.args[1], QuoteNode)
+        # The called "function" is a non-call `Expr` head
+        ex = Expr(ex.args[1].value, ex.args[2:end]...)
     end
+    isa(ex, Symbol) && return ex
+    isexpr(ex, :return) && return :(ReturnNode($(ex.args...)))
+    return :(Expr($(QuoteNode(ex.head)), $(ex.args...)))
+end
+
+function _insert_node_here!(compact::IncrementalCompact, line, settings::Settings, source::LineNumberNode, args...; reverse_affinity::Bool = false)
+    line = maybe_insert_debuginfo!(compact, settings, source, line, compact.result_idx)
+    _insert_node_here!(compact, line, args...; reverse_affinity)
+end
+
+# function _insert_node_here!(compact::IncrementalCompact, line, ex::Expr; reverse_affinity::Bool = false)
+#     isexpr(ex, :(::), 2) || throw(ArgumentError("Expected type-annotated expression, got $ex"))
+#     ex, type = ex.args
+#     return _insert_node_here!(compact::IncrementalCompact, line, inst_ex, type; reverse_affinity)
+# end
+
+function _insert_node_here!(compact::IncrementalCompact, line, inst_ex, type; reverse_affinity::Bool = false)
+    inst = NewInstruction(inst_ex, type, line)
+    return insert_node_here!(compact, inst, reverse_affinity)
 end
 
 """