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 dead-lock in WeakKeyDict #33756

Closed
wants to merge 2 commits into from
Closed

fix dead-lock in WeakKeyDict #33756

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5502f6
fix deadlock in WeakKeyDict iterate! method
Nov 3, 2019
c7e2f1f
clarify that objects may be garbage collected
Nov 3, 2019
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
8 changes: 6 additions & 2 deletions base/weakkeydict.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
WeakKeyDict([itr])

`WeakKeyDict()` constructs a hash table where the keys are weak
references to objects, and thus may be garbage collected even when
references to objects which may be garbage collected even when
referenced in a hash table.

See [`Dict`](@ref) for further help. Note, unlike [`Dict`](@ref),
Expand Down Expand Up @@ -126,7 +126,11 @@ end
function iterate(t::WeakKeyDict{K,V}, state) where V where K
gc_token = first(state)
y = iterate(t.ht, tail(state)...)
y === nothing && return nothing
if y === nothing
gc_token[] = true
finalize(gc_token)
return nothing
end
wkv, i = y
kv = Pair{K,V}(wkv[1].value::K, wkv[2])
return (kv, (gc_token, i))
Expand Down