Skip to content

Change _setindex implementation for tuples to improve constant propagation #40635

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
KristofferC merged 9 commits into from
Jul 5, 2021
Merged

Change _setindex implementation for tuples to improve constant propagation #40635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
711329a
Merge pull request #1 from JuliaLang/master
OlivierHnt Apr 27, 2021
a0ab4e7
Update tuple.jl
OlivierHnt Apr 27, 2021
8b78a37
Merge pull request #2 from OlivierHnt/OlivierHnt-_setindex
OlivierHnt Apr 27, 2021
eb5b463
Add inference tests for `_setindex`
OlivierHnt Apr 29, 2021
5c174cf
Fix trailing white space issue
OlivierHnt Apr 29, 2021
95d71a6
Merge pull request #3 from JuliaLang/master
OlivierHnt Jun 15, 2021
f325793
Merge pull request #4 from JuliaLang/master
OlivierHnt Jun 22, 2021
9a03ed2
Call `setindex`method
OlivierHnt Jun 29, 2021
00d56cb
Rebase PR with JuliaLang/master
OlivierHnt Jun 29, 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
5 changes: 2 additions & 3 deletions base/tuple.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@ function setindex(x::Tuple, v, i::Integer)
_setindex(v, i, x...)
end

function _setindex(v, i::Integer, first, tail...)
function _setindex(v, i::Integer, args...)
@_inline_meta
return (ifelse(i == 1, v, first), _setindex(v, i - 1, tail...)...)
return ntuple(j -> ifelse(j == i, v, args[j]), length(args))
end
_setindex(v, i::Integer) = ()


## iterating ##
Expand Down
3 changes: 3 additions & 0 deletions test/tuple.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,9 @@ end

@test Base.setindex((1, 2, 4), 4, true) === (4, 2, 4)
@test_throws BoundsError Base.setindex((1, 2), 2, false)

f() = Base.setindex((1:1, 2:2, 3:3), 9, 1)
@test @inferred(f()) == (9, 2:2, 3:3)
end

@testset "inferrable range indexing with constant values" begin
Expand Down