Skip to content

Commit 10b572c

Browse files
staticfloatKeno
authored andcommitted
Rename one typeinf_ext method to typeinf_ext_toplevel
This disambiguates the two methods, allowing us to eliminate the redundant `world::UInt` parameter.
1 parent c5fcd73 commit 10b572c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

base/compiler/compiler.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ include("compiler/typeinfer.jl")
111111
include("compiler/optimize.jl") # TODO: break this up further + extract utilities
112112

113113
include("compiler/bootstrap.jl")
114-
ccall(:jl_set_typeinf_func, Cvoid, (Any,), typeinf_ext)
114+
ccall(:jl_set_typeinf_func, Cvoid, (Any,), typeinf_ext_toplevel)
115115

116116
end # baremodule Compiler
117117
))

base/compiler/ssair/inlining.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ function early_inline_special_case(ir::IRCode, s::Signature, e::Expr, params::Op
11981198
return nothing
11991199
end
12001200

1201-
function late_inline_special_case!(ir::IRCode, sig::Signature, idx::Int, stmt::Expr, params::Params)
1201+
function late_inline_special_case!(ir::IRCode, sig::Signature, idx::Int, stmt::Expr, params::OptimizationParams)
12021202
typ = ir.types[idx]
12031203
f, ft, atypes = sig.f, sig.ft, sig.atypes
12041204
if params.inlining && length(atypes) == 3 && istopfunction(f, :!==)

base/compiler/typeinfer.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,9 +596,9 @@ function typeinf_type(interp::AbstractInterpreter, method::Method, @nospecialize
596596
return widenconst(frame.result)
597597
end
598598

599-
# This is a bridge for the C code calling `jl_typinf_func()`
600-
typeinf_ext(mi::MethodInstance, world::UInt) = typeinf_ext(NativeInterpreter(world), mi, world)
601-
function typeinf_ext(interp::AbstractInterpreter, linfo::MethodInstance, world::UInt)
599+
# This is a bridge for the C code calling `jl_typeinf_func()`
600+
typeinf_ext_toplevel(mi::MethodInstance, world::UInt) = typeinf_ext_toplevel(NativeInterpreter(world), mi)
601+
function typeinf_ext_toplevel(interp::AbstractInterpreter, linfo::MethodInstance)
602602
if isa(linfo.def, Method)
603603
# method lambda - infer this specialization via the method cache
604604
src = typeinf_ext(interp, linfo)

0 commit comments

Comments
 (0)