gh-117657: use relaxed loads for checking dict keys immortality - #118067
Merged
DinoV merged 1 commit intoApr 19, 2024
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
colesbury
approved these changes
Apr 18, 2024
colesbury
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
LGTM
Sorry, something went wrong.
Comment thread
Objects/dictobject.c
| dictkeys_incref(PyDictKeysObject *dk) | ||
| { | ||
| if (dk->dk_refcnt == _Py_IMMORTAL_REFCNT) { | ||
| if (FT_ATOMIC_LOAD_SSIZE_RELAXED(dk->dk_refcnt) == _Py_IMMORTAL_REFCNT) { |
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
We could also do dk == Py_EMPTY_KEYS and avoid the atomics, but this seems fine too.
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
Author
There was a problem hiding this comment.
I kind of like that, but am a little worried that it'll be overlooked if any other keys become immortal, so I'll just keep it as-is for now.
Sorry, something went wrong.
Copy link
Copy Markdown
⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️Hi! The buildbot AMD64 RHEL7 LTO 3.x has failed when building commit 1e4a4c4. What do you need to do:
You can take a look at the buildbot page here: https://buildbot.python.org/all/#builders/507/builds/7247 Failed tests:
Summary of the results of the build (if available): == Click to see traceback logsremote: Enumerating objects: 7, done.
remote: Counting objects: 16% (1/6)
remote: Counting objects: 33% (2/6)
remote: Counting objects: 50% (3/6)
remote: Counting objects: 66% (4/6)
remote: Counting objects: 83% (5/6)
remote: Counting objects: 100% (6/6)
remote: Counting objects: 100% (6/6), done.
remote: Compressing objects: 16% (1/6)
remote: Compressing objects: 33% (2/6)
remote: Compressing objects: 50% (3/6)
remote: Compressing objects: 66% (4/6)
remote: Compressing objects: 83% (5/6)
remote: Compressing objects: 100% (6/6)
remote: Compressing objects: 100% (6/6), done.
remote: Total 7 (delta 0), reused 2 (delta 0), pack-reused 1
From https://github.com/python/cpython
* branch main -> FETCH_HEAD
Note: checking out '1e4a4c4897d0f45b1f594bc429284c82efe49188'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:
git checkout -b new_branch_name
HEAD is now at 1e4a4c4... gh-117657: use relaxed loads for checking dict keys immortality (#118067)
Switched to and reset branch 'main'
make: *** [Makefile:2229: buildbottest] Error 2 |
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Checking for immortality of dict keys is reported as a TSAN violation, we just need relaxed loads