Merge pull request #159 from JuliaDebug/teh/generated

 Fix "sg" for parametric generated functions

Author: timholy

src/construct.jl

@@ -45,10 +45,10 @@ function namedtuple(kwargs)
     return NamedTuple{(names...,), Tuple{types...}}(vals)
 end
 
-get_source(meth) = Base.uncompressed_ast(meth)
+get_source(meth::Method) = Base.uncompressed_ast(meth)
 
-function get_source(g::GeneratedFunctionStub)
-    b = g(g.argnames...)
+function get_source(g::GeneratedFunctionStub, env)
+    b = g(env..., g.argnames...)
     b isa CodeInfo && return b
     return eval(b)
 end
@@ -138,7 +138,7 @@ function prepare_framecode(method::Method, @nospecialize(argtypes); enter_genera
             generator = false
         else
             if is_generated(method)
-                code = get_source(method.generator)
+                code = get_source(method.generator, lenv)
                 generator = true
             else
                 code = get_source(method)

test/breakpoints.jl

@@ -101,7 +101,7 @@ end
         breakpoint(String(method.file), method.line+1)
         frame = JuliaInterpreter.enter_call(loop_radius2, 2)
         ret = @interpret JuliaInterpreter.locals(frame)
-        @test isa(ret, JuliaInterpreter.BreakpointRef)
+        @test isa(ret, Tuple{Frame,JuliaInterpreter.BreakpointRef})
         # Test kwarg method
         remove()
         bp = breakpoint(tmppath, 3)

test/debug.jl

@@ -25,6 +25,10 @@ end
     :(return $T)
 end
 callgenerated() = generatedfoo(1)
+@generated function generatedparams(a::Array{T,N}) where {T,N}
+    :(return ($T,$N))
+end
+callgeneratedparams() = generatedparams([1 2; 3 4])
 
 macro insert_some_calls()
     esc(quote
@@ -100,6 +104,17 @@ struct B{T} end
         @test debug_command(frame, "finish") === nothing
         @test frame.callee === nothing
         @test get_return(frame) === 1
+
+        # Parametric generated function (see #157)
+        frame = fr = JuliaInterpreter.enter_call(callgeneratedparams)
+        while fr.pc < JuliaInterpreter.nstatements(fr.framecode) - 1
+            fr, pc = debug_command(fr, "se")
+        end
+        fr, pc = debug_command(fr, "sg")
+        @test JuliaInterpreter.scopeof(fr).name == :generatedparams
+        fr, pc = debug_command(fr, "finish")
+        @test debug_command(fr, "finish") === nothing
+        @test JuliaInterpreter.get_return(fr) == (Int, 2)
     end
 
     @testset "Optional arguments" begin