Skip to content

Fix Tuple inference regression from #18467 #18572

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
Sep 25, 2016
Merged

Fix Tuple inference regression from #18467 #18572

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
2 changes: 1 addition & 1 deletion base/inference.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ isType(t::ANY) = isa(t,DataType) && is((t::DataType).name,Type.name)
# true if Type is inlineable as constant
isconstType(t::ANY,b::Bool) =
isType(t) && !has_typevars(t.parameters[1],b) &&
!issubtype(Tuple{Vararg}, t.parameters[1]) # work around inference bug #18450
!issubtype(Type{Tuple{Vararg}}, t) # work around inference bug #18450

const IInf = typemax(Int) # integer infinity
const n_ifunc = reinterpret(Int32,arraylen)+1
Expand Down
3 changes: 3 additions & 0 deletions test/inference.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,3 +368,6 @@ end
# issue #18450
f18450() = ifelse(true, Tuple{Vararg{Int}}, Tuple{Vararg})
@test f18450() == Tuple{Vararg{Int}}

# issue #18569
@test Core.Inference.isconstType(Type{Tuple},true)