Merge pull request #416 from JuliaDebug/teh/nightly

Fix a couple of new breakages on nightly

Author: timholy

src/utils.jl

@@ -34,6 +34,7 @@ function whichtt(@nospecialize(tt))
     # TODO: provide explicit control over world age? In case we ever need to call "old" methods.
     m = ccall(:jl_gf_invoke_lookup, Any, (Any, UInt), tt, typemax(UInt))
     m === nothing && return nothing
+    isa(m, Method) && return m
     return m.func::Method
 end
 
@@ -653,9 +654,15 @@ function Base.show_backtrace(io::IO, frame::Frame)
     print(io, "\nStacktrace:")
     try invokelatest(Base.update_stackframes_callback[], stackframes) catch end
     frame_counter = 0
-    for (last_frame, n) in stackframes
+    nd = ndigits(length(stackframes))
+    for (i, (last_frame, n)) in enumerate(stackframes)
         frame_counter += 1
-        Base.show_trace_entry(IOContext(io, :backtrace => true), last_frame, n, prefix = string(" [", frame_counter, "] "))
+        if isdefined(Base, :print_stackframe)
+            println(io)
+            Base.print_stackframe(io, i, last_frame, n, nd, Base.info_color())
+        else
+            Base.show_trace_entry(IOContext(io, :backtrace => true), last_frame, n, prefix = string(" [", frame_counter, "] "))
+        end
     end
 end
 

test/interpret.jl

@@ -474,10 +474,21 @@ try
     frame, bp = @interpret g_1(2.0)
     stacktrace_lines = split(sprint(Base.display_error, bp.err, leaf(frame)), '\n')
     @test occursin(string("ERROR: ", sprint(showerror, ErrorException("foo"))), stacktrace_lines[1])
-    @test occursin("[1] error(::String) at error.jl:", stacktrace_lines[3])
-    @test occursin("[2] g_3(::Float64) at $(@__FILE__):$(line_g - 1)", stacktrace_lines[4])
-    @test occursin("[3] g_2(::Float64) at $(@__FILE__):$(line_g - 2)", stacktrace_lines[5])
-    @test occursin("[4] g_1(::Float64) at $(@__FILE__):$(line_g - 3)", stacktrace_lines[6])
+    if isdefined(Base, :print_stackframe)
+        @test occursin("[1] error(s::String)", stacktrace_lines[3])
+        @test occursin("[2] g_3(x::Float64)", stacktrace_lines[5])
+        thefile = Base.replaceuserpath(@__FILE__)
+        @test occursin("$thefile:$(line_g - 1)", stacktrace_lines[6])
+        @test occursin("[3] g_2(x::Float64)", stacktrace_lines[7])
+        @test occursin("$thefile:$(line_g - 2)", stacktrace_lines[8])
+        @test occursin("[4] g_1(x::Float64)", stacktrace_lines[9])
+        @test occursin("$thefile:$(line_g - 3)", stacktrace_lines[10])
+    else
+        @test occursin("[1] error(::String) at error.jl:", stacktrace_lines[3])
+        @test occursin("[2] g_3(::Float64) at $(@__FILE__):$(line_g - 1)", stacktrace_lines[4])
+        @test occursin("[3] g_2(::Float64) at $(@__FILE__):$(line_g - 2)", stacktrace_lines[5])
+        @test occursin("[4] g_1(::Float64) at $(@__FILE__):$(line_g - 3)", stacktrace_lines[6])
+    end
 finally
     break_off(:error)
 end
@@ -492,11 +503,24 @@ try
     frame, bp = JuliaInterpreter.debug_command(frame, :c, true)
     stacktrace_lines = split(sprint(Base.display_error, bp.err, leaf(frame)), '\n')
     @test occursin(string("ERROR: ", sprint(showerror, ErrorException("foo"))), stacktrace_lines[1])
-    @test occursin("[1] error(::String) at error.jl:", stacktrace_lines[3])
-    @test occursin("[2] g_3(::Float64) at $(@__FILE__):$(line_g - 1)", stacktrace_lines[4])
-    @test occursin("[3] g_2(::Float64) at $(@__FILE__):$(line_g - 2)", stacktrace_lines[5])
-    @test occursin("[4] g_1(::Float64) at $(@__FILE__):$(line_g - 3)", stacktrace_lines[6])
-    @test occursin("[5] top-level scope at $(@__FILE__):$(line2_g - 2)", stacktrace_lines[7])
+    if isdefined(Base, :print_stackframe)
+        @test occursin("[1] error(s::String)", stacktrace_lines[3])
+        thefile = Base.replaceuserpath(@__FILE__)
+        @test occursin("[2] g_3(x::Float64)", stacktrace_lines[5])
+        @test occursin("$thefile:$(line_g - 1)", stacktrace_lines[6])
+        @test occursin("[3] g_2(x::Float64)", stacktrace_lines[7])
+        @test occursin("$thefile:$(line_g - 2)", stacktrace_lines[8])
+        @test occursin("[4] g_1(x::Float64)", stacktrace_lines[9])
+        @test occursin("$thefile:$(line_g - 3)", stacktrace_lines[10])
+        @test occursin("[5] top-level scope", stacktrace_lines[11])
+        @test occursin("$thefile:$(line2_g - 2)", stacktrace_lines[12])
+    else
+        @test occursin("[1] error(::String) at error.jl:", stacktrace_lines[3])
+        @test occursin("[2] g_3(::Float64) at $(@__FILE__):$(line_g - 1)", stacktrace_lines[4])
+        @test occursin("[3] g_2(::Float64) at $(@__FILE__):$(line_g - 2)", stacktrace_lines[5])
+        @test occursin("[4] g_1(::Float64) at $(@__FILE__):$(line_g - 3)", stacktrace_lines[6])
+        @test occursin("[5] top-level scope at $(@__FILE__):$(line2_g - 2)", stacktrace_lines[7])
+    end
 finally
     break_off(:error)
 end