Pass enter_generated settings through to recursive frame creation

Author: timholy

src/construct.jl

@@ -292,7 +292,11 @@ end
 Construct a new `Frame` for `framecode`, given lowered-code arguments `frameargs` and
 static parameters `lenv`. See [`JuliaInterpreter.prepare_call`](@ref) for information about how to prepare the inputs.
 """
-function prepare_frame(framecode::FrameCode, args::Vector{Any}, lenv::SimpleVector)
+function prepare_frame(framecode::FrameCode, args::Vector{Any}, lenv::SimpleVector; enter_generated=false)
+    s = scopeof(framecode)
+    if isa(s, Method) && is_generated(s) && enter_generated
+        args = Any[_Typeof(a) for a in args]
+    end
     framedata = prepare_framedata(framecode, args)
     resize!(framedata.sparams, length(lenv))
     # Add static parameters to environment
@@ -304,8 +308,8 @@ function prepare_frame(framecode::FrameCode, args::Vector{Any}, lenv::SimpleVect
     return Frame(framecode, framedata)
 end
 
-function prepare_frame_caller(caller::Frame, framecode::FrameCode, args::Vector{Any}, lenv::SimpleVector)
-    caller.callee = frame = prepare_frame(framecode, args, lenv)
+function prepare_frame_caller(caller::Frame, framecode::FrameCode, args::Vector{Any}, lenv::SimpleVector; enter_generated=false)
+    caller.callee = frame = prepare_frame(framecode, args, lenv; enter_generated=enter_generated)
     frame.caller = caller
     return frame
 end

src/interpret.jl

@@ -208,7 +208,7 @@ function evaluate_call_recurse!(@nospecialize(recurse), frame::Frame, call_expr:
         end
         return framecode  # this was a Builtin
     end
-    newframe = prepare_frame_caller(frame, framecode, fargs, lenv)
+    newframe = prepare_frame_caller(frame, framecode, fargs, lenv; enter_generated=enter_generated)
     npc = newframe.pc
     shouldbreak(newframe, npc) && return BreakpointRef(newframe.framecode, npc)
     # if the following errors, handle_err will pop the stack and recycle newframe

test/debug.jl

@@ -21,8 +21,8 @@ function step_through_function(f, args...)
     return JuliaInterpreter.get_return(frame)
 end
 
-@generated function generatedfoo(T)
-    :(return $T)
+@generated function generatedfoo(x)
+    :(return x)
 end
 callgenerated() = generatedfoo(1)
 @generated function generatedparams(a::Array{T,N}) where {T,N}
@@ -87,23 +87,23 @@ struct B{T} end
         @test isa(pc, BreakpointRef)
         @test JuliaInterpreter.scopeof(f).name == :generatedfoo
         stmt = JuliaInterpreter.pc_expr(f)
-        @test stmt.head == :return && stmt.args[1] === Int
+        @test stmt.head == :return
         @test debug_command(frame, "c") === nothing
         @test frame.callee === nothing
-        @test get_return(frame) === Int
+        @test get_return(frame) === 1
         # This time, step into the generated function itself
         frame = enter_call_expr(:($(callgenerated)()))
         f, pc = debug_command(frame, "sg")
         @test isa(pc, BreakpointRef)
         @test JuliaInterpreter.scopeof(f).name == :generatedfoo
         stmt = JuliaInterpreter.pc_expr(f)
-        @test stmt.head == :return && @lookup(f, stmt.args[1]) === 1
+        @test stmt.head == :return
         f2, pc = debug_command(f, "finish")
         @test JuliaInterpreter.scopeof(f2).name == :callgenerated
         # Now finish the regular function
         @test debug_command(frame, "finish") === nothing
         @test frame.callee === nothing
-        @test get_return(frame) === 1
+        @test get_return(frame) === Int
 
         # Parametric generated function (see #157)
         frame = fr = JuliaInterpreter.enter_call(callgeneratedparams)