bugfix

Author: KDr2

src/tapedfunction.jl

@@ -79,7 +79,7 @@ function reset!(tf::TapedFunction, ir::IRTools.IR, tape::RawTape)
     tf.tape = tape
     blk_map = Dict{Int, Int}()
 
-    for (i, ins) in tf.tape
+    for (i, ins) in enumerate(tf.tape)
         isa(ins, BlockInstruction) || continue
         blk_map[ins.id] = i
     end
@@ -159,7 +159,8 @@ end
 function (instr::Instruction{F})() where F
     # catch run-time exceptions / errors.
     try
-        output = instr.func(map(val, instr.input)...)
+        func = val(instr.func)
+        output = func(map(val, instr.input)...)
         instr.output.val = output
         instr.tape.counter += 1
     catch e
@@ -225,7 +226,7 @@ end
 
 function translate!(taped::Taped, ir::IRTools.IR)
     tape = taped.tape
-    boxes = Dict{Any, Box{Any}}()
+    boxes = Dict{IRTools.Variable, Box{Any}}()
     _box = (x) -> arg_boxer(x, boxes)
     for (blk_id, blk) in enumerate(IRTools.blocks(ir))
         # blocks

src/tapedtask.jl

@@ -201,11 +201,12 @@ end
 copy_box(o, roster::Dict{UInt64, Any}) = o
 
 function Base.copy(x::Instruction, on_tape::Taped, roster::Dict{UInt64, Any})
+    func = copy_box(x.func, roster)
     input = map(x.input) do ob
         copy_box(ob, roster)
     end
     output = copy_box(x.output, roster)
-    Instruction(x.func, input, output, on_tape)
+    Instruction(func, input, output, on_tape)
 end
 
 function Base.copy(x::BlockInstruction, on_tape::Taped, roster::Dict{UInt64, Any})
@@ -235,6 +236,10 @@ function Base.copy(old_data::RawTape, on_tape::Taped, roster::Dict{UInt64, Any})
         new_ins = copy(x, on_tape, roster)
         new_data[i] = new_ins
     end
+
+    init_ins = Instruction(args_initializer(new_data[2]), (),
+                           Box{Any}(nothing), on_tape)
+    new_data[1] = init_ins
     return new_data
 end