Skip to content

fix performance of ProductIterator for non-concrete iterators #59711

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
Oct 2, 2025
Merged

fix performance of ProductIterator for non-concrete iterators #59711

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
9 changes: 6 additions & 3 deletions base/iterators.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using .Base:
(:), |, +, -, *, !==, !, ==, !=, <=, <, >, >=, =>, missing,
any, _counttuple, eachindex, ntuple, zero, prod, reduce, in, firstindex, lastindex,
tail, fieldtypes, min, max, minimum, zero, oneunit, promote, promote_shape, LazyString,
afoldl, mod1
afoldl, mod1, @default_eltype
using .Core
using Core: @doc

Expand Down Expand Up @@ -1176,6 +1176,8 @@ end
next === nothing && return nothing
restnext = _piterate(rest...)
restnext === nothing && return nothing
VS = @default_eltype(iter1)
next = Pair{VS, typeof(next[2])}(next[1], next[2])
return (next, restnext...)
end
@inline function iterate(P::ProductIterator)
Expand All @@ -1188,15 +1190,16 @@ end
@inline _piterate1(::Tuple{}, ::Tuple{}) = nothing
@inline function _piterate1(iters, states)
iter1 = first(iters)
next = iterate(iter1, first(states)[2])
restnext = tail(states)
state1, restnext... = states
next = iterate(iter1, state1[2])
if next === nothing
isdone(iter1) === true && return nothing
restnext = _piterate1(tail(iters), restnext)
restnext === nothing && return nothing
next = iterate(iter1)
next === nothing && return nothing
end
next = Pair{fieldtype(typeof(state1), 1), typeof(next[2])}(next[1], next[2])
return (next, restnext...)
end
@inline function iterate(P::ProductIterator, states)
Expand Down