Skip to content

Fix fieldtype_tfunc for union types #41667

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
martinholters merged 3 commits into from
Jul 22, 2021
Merged

Fix fieldtype_tfunc for union types #41667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4a922f
Fix `fieldtype_tfunc` for union types
martinholters Jul 21, 2021
947dcb1
Update base/compiler/tfuncs.jl
JeffBezanson Jul 21, 2021
02b3833
Update base/compiler/tfuncs.jl
martinholters Jul 21, 2021
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
15 changes: 13 additions & 2 deletions base/compiler/tfuncs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,8 +1015,19 @@ function _fieldtype_tfunc(@nospecialize(s), exact::Bool, @nospecialize(name))
exact = exact && !has_free_typevars(s)
u = unwrap_unionall(s)
if isa(u, Union)
return tmerge(_fieldtype_tfunc(rewrap(u.a, s), exact, name),
_fieldtype_tfunc(rewrap(u.b, s), exact, name))
ta0 = _fieldtype_tfunc(rewrap(u.a, s), exact, name)
tb0 = _fieldtype_tfunc(rewrap(u.b, s), exact, name)
ta0 ⊑ tb0 && return tb0
tb0 ⊑ ta0 && return ta0
ta, exacta, _, istypea = instanceof_tfunc(ta0)
tb, exactb, _, istypeb = instanceof_tfunc(tb0)
if exact && exacta && exactb
return Const(Union{ta, tb})
end
if istypea && istypeb
return Type{<:Union{ta, tb}}
end
return Any
end
u isa DataType || return Any
if isabstracttype(u)
Expand Down
11 changes: 11 additions & 0 deletions test/compiler/inference.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3395,3 +3395,14 @@ end
x.x
end) == Any[Int]
end

@testset "fieldtype for unions" begin # e.g. issue #40177
f40177(::Type{T}) where {T} = fieldtype(T, 1)
for T in [
Union{Tuple{Val}, Tuple{Tuple}},
Union{Base.RefValue{T}, Type{Int32}} where T<:Real,
Union{Tuple{Vararg{Symbol}}, Tuple{Float64, Vararg{Float32}}},
]
@test @inferred(f40177(T)) == fieldtype(T, 1)
end
end