Skip to content
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

fix #41908, inference error in subst_trivial_bounds #41976

Merged
merged 2 commits into from
Aug 25, 2021
Merged

fix #41908, inference error in subst_trivial_bounds #41976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b1d1ba
fix #41908, inference error in subst_trivial_bounds
JeffBezanson Aug 23, 2021
ee53aca
Apply suggestions from code review
JeffBezanson Aug 24, 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
10 changes: 9 additions & 1 deletion base/compiler/utilities.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,15 @@ function subst_trivial_bounds(@nospecialize(atypes))
end
v = atypes.var
if isconcretetype(v.ub) || v.lb === v.ub
return subst_trivial_bounds(atypes{v.ub})
subst = try
atypes{v.ub}
catch
# Note in rare cases a var bound might not be valid to substitute.
nothing
end
if subst !== nothing
return subst_trivial_bounds(subst)
end
Comment on lines +159 to +167
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh boy, this is a nice example for justifying a

try
catch
else
    # code that runs when no exception was thrown
end

construct. But given that we don't have it, I guess this is fine.

end
return UnionAll(v, subst_trivial_bounds(atypes.body))
end
Expand Down
5 changes: 5 additions & 0 deletions test/compiler/inference.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3403,3 +3403,8 @@ end
@test @inferred(f40177(T)) == fieldtype(T, 1)
end
end

# issue #41908
f41908(x::Complex{T}) where {String<:T<:String} = 1
g41908() = f41908(Any[1][1])
@test only(Base.return_types(g41908, ())) <: Int