Fix functionality and tests on nightly (#90)

JuliaDebug · Oct 4, 2020 · b3dc48b · b3dc48b
1 parent f71e27a
commit b3dc48b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/src/reflection.jl b/src/reflection.jl
@@ -51,6 +51,9 @@ function find_callsites(CI::Core.CodeInfo, mi::Core.MethodInstance, slottypes; p
         if isa(ft, Const)
             ft = ft.val
         end
+        if isa(ft, Function)
+            ft = typeof(ft)
+        end
         argTs = argextype(c.args[arg_base + 3], CI, sptypes, slottypes)
         if isa(argTs, Const)
             sig = Tuple{widenconst(ft), argTs.val.parameters...}

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -103,12 +103,16 @@ end
 callf(f::F, x) where F = f(x)
 let callsites = find_callsites_by_ftt(callf, Tuple{Union{typeof(sin), typeof(cos)}, Float64})
     @test !isempty(callsites)
-    @test first(callsites).info isa Cthulhu.MultiCallInfo
-    callinfos = first(callsites).info.callinfos
-    @test !isempty(callinfos)
-    mis = map(Cthulhu.get_mi, callinfos)
-    @test any(mi->mi.def.name == :cos, mis)
-    @test any(mi->mi.def.name == :sin, mis)
+    if length(callsites) == 1
+        @test first(callsites).info isa Cthulhu.MultiCallInfo
+        callinfos = first(callsites).info.callinfos
+        @test !isempty(callinfos)
+        mis = map(Cthulhu.get_mi, callinfos)
+        @test any(mi->mi.def.name == :cos, mis)
+        @test any(mi->mi.def.name == :sin, mis)
+    else
+        @test all(cs->cs.info isa Cthulhu.MICallInfo, callsites)
+    end
 end
 
 function toggler(toggle)
@@ -121,12 +125,16 @@ function toggler(toggle)
 end
 let callsites = find_callsites_by_ftt(toggler, Tuple{Bool})
     @test !isempty(callsites)
-    @test first(callsites).info isa Cthulhu.MultiCallInfo
-    callinfos = first(callsites).info.callinfos
-    @test !isempty(callinfos)
-    mis = map(Cthulhu.get_mi, callinfos)
-    @test any(mi->mi.def.name == :cos, mis)
-    @test any(mi->mi.def.name == :sin, mis)
+    if length(callsites) == 1
+        @test first(callsites).info isa Cthulhu.MultiCallInfo
+        callinfos = first(callsites).info.callinfos
+        @test !isempty(callinfos)
+        mis = map(Cthulhu.get_mi, callinfos)
+        @test any(mi->mi.def.name == :cos, mis)
+        @test any(mi->mi.def.name == :sin, mis)
+    else
+        @test all(cs->cs.info isa Cthulhu.MICallInfo, callsites)
+    end
 end
 
 @testset "warntype variables" begin