Address some post-commit review from JuliaLang#56660 (JuliaLang#56747)

Some more questions still to be answered, but this should address the
immediate actionable review items.

Author: Keno

extras/CompilerDevTools/src/CompilerDevTools.jl

@@ -34,19 +34,11 @@ import Core.OptimizedGenerics.CompilerPlugins: typeinf, typeinf_edge
     Compiler.typeinf_edge(interp, mi.def, mi.specTypes, Core.svec(), parent_frame, false, false)
 end
 
-# TODO: This needs special compiler support to properly case split for multiple
-# method matches, etc.
-@noinline function mi_for_tt(tt, world=Base.tls_world_age())
-    interp = SplitCacheInterp(; world)
-    match, _ = Compiler.findsup(tt, Compiler.method_table(interp))
-    Base.specialize_method(match)
-end
-
 function with_new_compiler(f, args...)
-    tt = Base.signature_type(f, typeof(args))
+    mi = @ccall jl_method_lookup(Any[f, args...]::Ptr{Any}, (1+length(args))::Csize_t, Base.tls_world_age()::Csize_t)::Ref{Core.MethodInstance}
     world = Base.tls_world_age()
     new_compiler_ci = Core.OptimizedGenerics.CompilerPlugins.typeinf(
-        SplitCacheOwner(), mi_for_tt(tt), Compiler.SOURCE_MODE_ABI
+        SplitCacheOwner(), mi, Compiler.SOURCE_MODE_ABI
     )
     invoke(f, new_compiler_ci, args...)
 end

src/abstractinterpretation.jl

@@ -2223,11 +2223,12 @@ function abstract_invoke(interp::AbstractInterpreter, arginfo::ArgInfo, si::Stmt
         if isa(method_or_ci, CodeInstance)
             our_world = sv.world.this
             argtype = argtypes_to_type(pushfirst!(argtype_tail(argtypes, 4), ft))
-            sig = method_or_ci.def.specTypes
+            specsig = method_or_ci.def.specTypes
+            defdef = method_or_ci.def.def
             exct = method_or_ci.exctype
-            if !hasintersect(argtype, sig)
+            if !hasintersect(argtype, specsig)
                 return Future(CallMeta(Bottom, TypeError, EFFECTS_THROWS, NoCallInfo()))
-            elseif !(argtype <: sig)
+            elseif !(argtype <: specsig) || (isa(defdef, Method) && !(argtype <: defdef.sig))
                 exct = Union{exct, TypeError}
             end
             callee_valid_range = WorldRange(method_or_ci.min_world, method_or_ci.max_world)
@@ -2257,7 +2258,7 @@ function abstract_invoke(interp::AbstractInterpreter, arginfo::ArgInfo, si::Stmt
             # Fall through to generic invoke handling
         end
     else
-        widenconst(types) >: Union{Method, CodeInstance} && return Future(CallMeta(Any, Any, Effects(), NoCallInfo()))
+        hasintersect(widenconst(types), Union{Method, CodeInstance}) && return Future(CallMeta(Any, Any, Effects(), NoCallInfo()))
         (types, isexact, isconcrete, istype) = instanceof_tfunc(argtype_by_index(argtypes, 3), false)
         isexact || return Future(CallMeta(Any, Any, Effects(), NoCallInfo()))
         unwrapped = unwrap_unionall(types)

src/stmtinfo.jl

@@ -277,7 +277,7 @@ struct InvokeCICallInfo <: CallInfo
     edge::CodeInstance
 end
 add_edges_impl(edges::Vector{Any}, info::InvokeCICallInfo) =
-    add_one_edge!(edges, info.edge)
+    add_inlining_edge!(edges, info.edge)
 
 """
     info::InvokeCallInfo