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

improve effects of objectid and getindex(::Dict) #49447

Merged
merged 11 commits into from
Apr 25, 2023
Merged

improve effects of objectid and getindex(::Dict) #49447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0b05542
improve effects of and
oscardssmith Apr 20, 2023
ffdb5b9
Update dict.jl
oscardssmith Apr 20, 2023
ddabfcf
objectid is only sometimes foldable
oscardssmith Apr 20, 2023
a8b6812
bugfix
oscardssmith Apr 20, 2023
1cafd9c
address codereview
oscardssmith Apr 20, 2023
7866aa2
add tests
oscardssmith Apr 21, 2023
ec974b1
isimmutable is too strong
oscardssmith Apr 21, 2023
9619c1e
Update reflection.jl
oscardssmith Apr 24, 2023
2bcb4d9
Apply suggestions from code review
aviatesk Apr 25, 2023
9bff927
fix up and enrich test cases
aviatesk Apr 25, 2023
a582220
mark `Module` type as `identityfree`
aviatesk Apr 25, 2023
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
3 changes: 2 additions & 1 deletion base/dict.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,12 @@ function empty!(h::Dict{K,V}) where V where K
end

# get the index where a key is stored, or -1 if not present
function ht_keyindex(h::Dict{K,V}, key) where V where K
@assume_effects :terminates_locally function ht_keyindex(h::Dict{K,V}, key) where V where K
isempty(h) && return -1
sz = length(h.keys)
iter = 0
maxprobe = h.maxprobe
@assert maxprobe <= sz # needed for terminates_locally to be valid
index, sh = hashindex(key, sz)
keys = h.keys

Expand Down
5 changes: 4 additions & 1 deletion base/reflection.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,10 @@ If `x === y` then `objectid(x) == objectid(y)`, and usually when `x !== y`, `obj

See also [`hash`](@ref), [`IdDict`](@ref).
"""
objectid(@nospecialize(x)) = ccall(:jl_object_id, UInt, (Any,), x)
function objectid(@nospecialize(x))
@_foldable_meta
ccall(:jl_object_id, UInt, (Any,), x)
end

# concrete datatype predicates

Expand Down