fix #24658, handle interpreted frames better in firstcaller

JuliaLang · Nov 21, 2017 · ce2b3a4 · ce2b3a4
1 parent 2dad958
commit ce2b3a4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -95,7 +95,7 @@ function firstcaller(bt::Vector, funcsyms)
             found && @goto found
             found = lkup.func in funcsyms
             # look for constructor type name
-            if !found && lkup.linfo != nothing
+            if !found && lkup.linfo isa Core.MethodInstance
                 li = lkup.linfo
                 ft = ccall(:jl_first_argument_datatype, Any, (Any,), li.def.sig)
                 if isa(ft,DataType) && ft.name === Type.body.name

diff --git a/test/deprecation_exec.jl b/test/deprecation_exec.jl
@@ -73,3 +73,12 @@ end
     @test_warn "deprecated" f21972()
     @test_nowarn f21972()
 end
+
+f24658() = depwarn24658()
+
+depwarn24658() = Base.firstcaller(backtrace(), :_func_not_found_)
+
+@testset "firstcaller" begin
+    # issue #24658
+    @test eval(:(if true; f24658(); end)) == StackTraces.UNKNOWN
+end