Restore support for Expr(:line, ...) nodes

Author: timholy

src/utils.jl

@@ -269,7 +269,7 @@ function linetable(arg)
     end
     return (arg::CodeInfo).linetable::Vector{Any}
 end
-linetable(arg, i::Integer) = linetable(arg)[i]::LineTypes
+linetable(arg, i::Integer) = linetable(arg)[i]::Union{Expr,LineTypes}
 
 function codelocs(arg)
     if isa(arg, Frame)

test/debug.jl

@@ -142,6 +142,8 @@ end
         # This time, step into the generated function itself
         frame = enter_call_expr(:($(callgenerated)()))
         f, pc = debug_command(frame, :sg)
+            # Aside: generators can have `Expr(:line, ...)` in their line tables, test that this is OK
+            @test isexpr(JuliaInterpreter.linetable(f, 2), :line)
         @test isa(pc, BreakpointRef)
         @test JuliaInterpreter.scopeof(f).name == :generatedfoo
         stmt = JuliaInterpreter.pc_expr(f)