From bc418d394e1e0bf8d8e0438803ac741f06ee86d4 Mon Sep 17 00:00:00 2001
From: Sam Gross <colesbury@gmail.com>
Date: Thu, 6 Feb 2025 21:47:50 +0000
Subject: [PATCH] gh-117657: Fix data race in `dict_dict_merge`

Found while running `test_load_attr_module` from `test_opcache` under TSan.
---
 Objects/dictobject.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 91cf013a1dc24b..d979cd72b48e69 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -3793,7 +3793,7 @@ dict_dict_merge(PyInterpreterState *interp, PyDictObject *mp, PyDictObject *othe
 
             ensure_shared_on_resize(mp);
             dictkeys_decref(interp, mp->ma_keys, IS_DICT_SHARED(mp));
-            mp->ma_keys = keys;
+            set_keys(mp, keys);
             STORE_USED(mp, other->ma_used);
             ASSERT_CONSISTENT(mp);