Skip to content

Fix nospecializing Functions in Union{Nothing,Function} params (#59327) #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2025
Merged

Fix nospecializing Functions in Union{Nothing,Function} params (#59327) #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions src/gf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,14 +938,9 @@ static void jl_compilation_sig(
int notcalled_func = (i_arg > 0 && i_arg <= 8 && !(definition->called & (1 << (i_arg - 1))) &&
!jl_has_free_typevars(decl_i) &&
jl_subtype(elt, (jl_value_t*)jl_function_type));
if (notcalled_func && (type_i == (jl_value_t*)jl_any_type ||
type_i == (jl_value_t*)jl_function_type ||
(jl_is_uniontype(type_i) && // Base.Callable
((((jl_uniontype_t*)type_i)->a == (jl_value_t*)jl_function_type &&
((jl_uniontype_t*)type_i)->b == (jl_value_t*)jl_type_type) ||
(((jl_uniontype_t*)type_i)->b == (jl_value_t*)jl_function_type &&
((jl_uniontype_t*)type_i)->a == (jl_value_t*)jl_type_type))))) {
// and attempt to despecialize types marked Function, Callable, or Any
if (notcalled_func && (jl_subtype((jl_value_t*)jl_function_type, type_i))) {
// and attempt to despecialize types marked as a supertype of Function (i.e.
// Function, Callable, Any, or a Union{Function, T})
// when called with a subtype of Function but is not called
if (!*newparams) *newparams = jl_svec_copy(tt->parameters);
jl_svecset(*newparams, i, (jl_value_t*)jl_function_type);
Expand Down Expand Up @@ -1174,15 +1169,9 @@ JL_DLLEXPORT int jl_isa_compileable_sig(
int notcalled_func = (i_arg > 0 && i_arg <= 8 && !(definition->called & (1 << (i_arg - 1))) &&
!jl_has_free_typevars(decl_i) &&
jl_subtype(elt, (jl_value_t*)jl_function_type));
if (notcalled_func && (type_i == (jl_value_t*)jl_any_type ||
type_i == (jl_value_t*)jl_function_type ||
(jl_is_uniontype(type_i) && // Base.Callable
((((jl_uniontype_t*)type_i)->a == (jl_value_t*)jl_function_type &&
((jl_uniontype_t*)type_i)->b == (jl_value_t*)jl_type_type) ||
(((jl_uniontype_t*)type_i)->b == (jl_value_t*)jl_function_type &&
((jl_uniontype_t*)type_i)->a == (jl_value_t*)jl_type_type))))) {
// and attempt to despecialize types marked Function, Callable, or Any
// when called with a subtype of Function but is not called
if (notcalled_func && jl_subtype((jl_value_t*)jl_function_type, type_i)) {
// and attempt to despecialize types marked as a supertype of Function (i.e.
// Function, Callable, Any, or a Union{Function, T})
if (elt == (jl_value_t*)jl_function_type)
continue;
JL_GC_POP();
Expand Down
56 changes: 56 additions & 0 deletions test/core.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,62 @@ k11840(::Type{Union{Tuple{Int32}, Tuple{Int64}}}) = '2'
@test k11840(Tuple{Union{Int32, Int64}}) == '2'
@test k11840(Union{Tuple{Int32}, Tuple{Int64}}) == '2'

# issue #59327
@noinline f59327(f, x) = Any[f, x]
g59327(x) = f59327(+, Any[x][1])
g59327(1)
@test any(
mi->mi isa Core.MethodInstance && mi.specTypes == Tuple{typeof(f59327), Function, Int},
methods(f59327)[1].specializations)

@noinline h59327(f::Union{Function, Nothing}, x) = Any[f, x]
i59327(x) = h59327(+, Any[x][1])
i59327(1)
@test any(
mi->mi isa Core.MethodInstance && mi.specTypes == Tuple{typeof(h59327), Function, Int},
methods(h59327)[1].specializations)

@noinline j59327(f::Function, x) = Any[f, x]
k59327(x) = j59327(+, Any[x][1])
k59327(1)
@test any(
mi->mi isa Core.MethodInstance && mi.specTypes == Tuple{typeof(j59327), Function, Int},
methods(j59327)[1].specializations
)

@noinline l59327(f::Base.Callable, x) = Any[f, x]
m59327(x) = l59327(+, Any[x][1])
m59327(1)
@test any(
mi->mi isa Core.MethodInstance && mi.specTypes == Tuple{typeof(l59327), Function, Int},
methods(l59327)[1].specializations
)

# _do_ specialize if the signature has a `where`
@noinline n59327(f::F, x) where F = Any[f, x]
o59327(x) = n59327(+, Any[x][1])
o59327(1)
@test !any(
mi->mi isa Core.MethodInstance && mi.specTypes == Tuple{typeof(n59327), Function, Int},
methods(n59327)[1].specializations
)
@test any(
mi->mi isa Core.MethodInstance && mi.specTypes == Tuple{typeof(n59327), typeof(+), Int},
methods(n59327)[1].specializations
)

# _do_ specialize if the signature is specific
@noinline n59327(f::typeof(+), x) = Any[f, x]
o59327(x) = n59327(+, Any[x][1])
o59327(1)
@test !any(
mi->mi isa Core.MethodInstance && mi.specTypes == Tuple{typeof(n59327), Function, Int},
methods(n59327)[1].specializations
)
@test any(
mi->mi isa Core.MethodInstance && mi.specTypes == Tuple{typeof(n59327), typeof(+), Int},
methods(n59327)[1].specializations
)

# issue #20511
f20511(x::DataType) = 0
Expand Down