GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-117657: Fix data race in `dict_dict_merge` by colesbury · Pull Request #129755 · python/cpython

Conversation

@colesbury

@colesbury colesbury commented Feb 6, 2025 •
edited by bedevere-app Bot
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor

Found while running test_load_attr_module from test_opcache under TSan.

  • Issue: Make TSAN tests pass with the GIL disabled in free-threaded builds #117657

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@colesbury
pythongh-117657: Fix data race in dict_dict_merge
bc418d3 
Found while running `test_load_attr_module` from `test_opcache` under TSan.
@colesbury colesbury added skip news topic-free-threading needs backport to 3.13 only security fixes labels Feb 6, 2025
@colesbury
colesbury requested a review from DinoV February 6, 2025 21:53
@colesbury
colesbury requested review from markshannon and methane as code owners February 6, 2025 21:53
@bedevere-app bedevere-app Bot added the awaiting core review label Feb 6, 2025
@bedevere-app bedevere-app Bot mentioned this pull request Feb 6, 2025
Make TSAN tests pass with the GIL disabled in free-threaded builds #117657
Closed
methane
methane approved these changes Feb 7, 2025
View reviewed changes
@bedevere-app bedevere-app Bot added awaiting merge and removed awaiting core review labels Feb 7, 2025
@colesbury
colesbury merged commit 34379d0 into python:main Feb 7, 2025
@miss-islington-app

miss-islington-app Bot commented Feb 7, 2025

Copy link
Copy Markdown

Thanks @colesbury for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@colesbury
colesbury deleted the gh-117657-dict-dict-merge branch February 7, 2025 14:44
@bedevere-app bedevere-app Bot removed the awaiting merge label Feb 7, 2025
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 7, 2025
@colesbury @miss-islington
pythongh-117657: Fix data race in dict_dict_merge (pythongh-129755)
4df3cc8 
Found while running `test_load_attr_module` from `test_opcache` under TSan.
(cherry picked from commit 34379d0)

Co-authored-by: Sam Gross <[email protected]>
@bedevere-app

bedevere-app Bot commented Feb 7, 2025

Copy link
Copy Markdown

GH-129808 is a backport of this pull request to the 3.13 branch.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@bedevere-app bedevere-app Bot removed the needs backport to 3.13 only security fixes label Feb 7, 2025
colesbury added a commit that referenced this pull request Feb 7, 2025
@miss-islington @colesbury
[3.13] gh-117657: Fix data race in dict_dict_merge (gh-129755) (gh-…
8a7146c 
…129808)

Found while running `test_load_attr_module` from `test_opcache` under TSan.
(cherry picked from commit 34379d0)

Co-authored-by: Sam Gross <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@methane methane methane approved these changes
@DinoV DinoV Awaiting requested review from DinoV
@markshannon markshannon Awaiting requested review from markshannon markshannon is a code owner

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

skip news topic-free-threading

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

2 participants

@colesbury @methane
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.