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 tmerge for (partially) const types with undef fields #43812

Merged
merged 3 commits into from
Jan 19, 2022
+26 −2
Merged

Fix tmerge for (partially) const types with undef fields #43812

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9116078
Fix `tmerge` for (partially) const types with undef fields
martinholters Jan 14, 2022
73d4651
Use `===` in a comparison to `Union{}`
martinholters Jan 14, 2022
c7ef143
Fix test for #43784
martinholters Jan 15, 2022
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
Prev Previous commit
Next Next commit
Use === in a comparison to Union{} 
Co-authored-by: Simeon Schaub <[email protected]>
@martinholters @simeonschaub
martinholters and simeonschaub authored Jan 14, 2022
commit 73d46513d10ab8b9e69f316b7d35cc822b063d7d
2 changes: 1 addition & 1 deletion base/compiler/typelimits.jl
View file
Original file line number Diff line number Diff line change
@@ -417,7 +417,7 @@ function tmerge(@nospecialize(typea), @nospecialize(typeb))
ai = getfield_tfunc(typea, Const(i))
bi = getfield_tfunc(typeb, Const(i))
ity = tmerge(ai, bi)
if ai === Union{} || bi == Union{}
if ai === Union{} || bi === Union{}
ity = widenconst(ity)
end
fields[i] = ity