From: Dino Viehland <dinoviehland@meta.com>
Date: Mon, 30 Sep 2024 17:04:32 +0000 (-0700)
Subject: gh-124642: Dictionaries aren't marking objects as weakref'd (#124643)
X-Git-Tag: v3.14.0a1~243
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=077e7ef6a0abbf9e04b9aa11b4f621031004c31f;p=thirdparty%2FPython%2Fcpython.git

gh-124642: Dictionaries aren't marking objects as weakref'd (#124643)

Dictionaries aren't marking objects as weakref'd
---

diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-09-27-17-18-53.gh-issue-124642.OCjhBJ.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-09-27-17-18-53.gh-issue-124642.OCjhBJ.rst
new file mode 100644
index 000000000000..29763844a9f5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core_and_Builtins/2024-09-27-17-18-53.gh-issue-124642.OCjhBJ.rst
@@ -0,0 +1 @@
+Fixed scalability issue in free-threaded builds for lock-free reads from dictionaries in multi-threaded scenarios
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index e50cf8bf1787..ef9d23e62f95 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1488,7 +1488,7 @@ read_failed:
     *value_addr = value;
     if (value != NULL) {
         assert(ix >= 0);
-        Py_INCREF(value);
+        _Py_NewRefWithLock(value);
     }
     Py_END_CRITICAL_SECTION();
     return ix;
@@ -7015,7 +7015,7 @@ _PyObject_TryGetInstanceAttribute(PyObject *obj, PyObject *name, PyObject **attr
             // Still no dict, we can read from the values
             assert(values->valid);
             value = values->values[ix];
-            *attr = Py_XNewRef(value);
+            *attr = _Py_XNewRefWithLock(value);
             success = true;
         }
 
@@ -7035,7 +7035,7 @@ _PyObject_TryGetInstanceAttribute(PyObject *obj, PyObject *name, PyObject **attr
 
     if (dict->ma_values == values && FT_ATOMIC_LOAD_UINT8(values->valid)) {
         value = _Py_atomic_load_ptr_relaxed(&values->values[ix]);
-        *attr = Py_XNewRef(value);
+        *attr = _Py_XNewRefWithLock(value);
         success = true;
     } else {
         // Caller needs to lookup from the dictionary