https://github.com/python/cpython/commit/73e74eeb2fc52c8fa7a71ee3234538de433b6ca1
commit: 73e74eeb2fc52c8fa7a71ee3234538de433b6ca1
branch: 3.14
author: Sam Gross <[email protected]>
committer: colesbury <[email protected]>
date: 2026-03-20T20:08:20Z
summary:
[3.14] gh-146227: Fix wrong type in _Py_atomic_load_uint16 in pyatomic_std.h
(gh-146229) (#146232)
Also fix a few related issues in the pyatomic headers:
* Fix _Py_atomic_store_uint_release in pyatomic_msc.h to use __stlr32
on ARM64 instead of a plain volatile store (which is only relaxed on
ARM64).
* Add missing _Py_atomic_store_uint_release to pyatomic_gcc.h.
* Fix pseudo-code comment for _Py_atomic_store_ptr_release in
pyatomic.h.
(cherry picked from commit 1eff27f2c0452b3114bcf139062c87c025842c3e)
files:
A
Misc/NEWS.d/next/Core_and_Builtins/2026-03-20-13-07-33.gh-issue-146227.MqBPEo.rst
M Include/cpython/pyatomic.h
M Include/cpython/pyatomic_gcc.h
M Include/cpython/pyatomic_msc.h
M Include/cpython/pyatomic_std.h
diff --git a/Include/cpython/pyatomic.h b/Include/cpython/pyatomic.h
index 790640309f1e03..3a71ed689d88d8 100644
--- a/Include/cpython/pyatomic.h
+++ b/Include/cpython/pyatomic.h
@@ -72,8 +72,8 @@
// def _Py_atomic_load_ptr_acquire(obj):
// return obj # acquire
//
-// def _Py_atomic_store_ptr_release(obj):
-// return obj # release
+// def _Py_atomic_store_ptr_release(obj, value):
+// obj = value # release
//
// def _Py_atomic_fence_seq_cst():
// # sequential consistency
@@ -529,6 +529,9 @@ _Py_atomic_store_int_release(int *obj, int value);
static inline int
_Py_atomic_load_int_acquire(const int *obj);
+static inline void
+_Py_atomic_store_uint_release(unsigned int *obj, unsigned int value);
+
static inline void
_Py_atomic_store_uint32_release(uint32_t *obj, uint32_t value);
diff --git a/Include/cpython/pyatomic_gcc.h b/Include/cpython/pyatomic_gcc.h
index 1566b83b9f6a1b..465226a76ab255 100644
--- a/Include/cpython/pyatomic_gcc.h
+++ b/Include/cpython/pyatomic_gcc.h
@@ -576,6 +576,10 @@ static inline void
_Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value)
{ __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
+static inline void
+_Py_atomic_store_uint_release(unsigned int *obj, unsigned int value)
+{ __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
+
static inline int
_Py_atomic_load_int_acquire(const int *obj)
{ return __atomic_load_n(obj, __ATOMIC_ACQUIRE); }
diff --git a/Include/cpython/pyatomic_msc.h b/Include/cpython/pyatomic_msc.h
index d155955df0cddf..eb6df819fa7ee8 100644
--- a/Include/cpython/pyatomic_msc.h
+++ b/Include/cpython/pyatomic_msc.h
@@ -971,12 +971,6 @@ _Py_atomic_store_ushort_relaxed(unsigned short *obj,
unsigned short value)
*(volatile unsigned short *)obj = value;
}
-static inline void
-_Py_atomic_store_uint_release(unsigned int *obj, unsigned int value)
-{
- *(volatile unsigned int *)obj = value;
-}
-
static inline void
_Py_atomic_store_long_relaxed(long *obj, long value)
{
@@ -1066,6 +1060,19 @@ _Py_atomic_store_int_release(int *obj, int value)
#endif
}
+static inline void
+_Py_atomic_store_uint_release(unsigned int *obj, unsigned int value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+ *(volatile unsigned int *)obj = value;
+#elif defined(_M_ARM64)
+ _Py_atomic_ASSERT_ARG_TYPE(unsigned __int32);
+ __stlr32((unsigned __int32 volatile *)obj, (unsigned __int32)value);
+#else
+# error "no implementation of _Py_atomic_store_uint_release"
+#endif
+}
+
static inline void
_Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value)
{
diff --git a/Include/cpython/pyatomic_std.h b/Include/cpython/pyatomic_std.h
index 7176f667a4082c..1a2ccd0cc12b48 100644
--- a/Include/cpython/pyatomic_std.h
+++ b/Include/cpython/pyatomic_std.h
@@ -459,7 +459,7 @@ static inline uint16_t
_Py_atomic_load_uint16(const uint16_t *obj)
{
_Py_USING_STD;
- return atomic_load((const _Atomic(uint32_t)*)obj);
+ return atomic_load((const _Atomic(uint16_t)*)obj);
}
static inline uint32_t
diff --git
a/Misc/NEWS.d/next/Core_and_Builtins/2026-03-20-13-07-33.gh-issue-146227.MqBPEo.rst
b/Misc/NEWS.d/next/Core_and_Builtins/2026-03-20-13-07-33.gh-issue-146227.MqBPEo.rst
new file mode 100644
index 00000000000000..11e19eb28313d6
--- /dev/null
+++
b/Misc/NEWS.d/next/Core_and_Builtins/2026-03-20-13-07-33.gh-issue-146227.MqBPEo.rst
@@ -0,0 +1,3 @@
+Fix wrong type in ``_Py_atomic_load_uint16`` in the C11 atomics backend
+(``pyatomic_std.h``), which used a 32-bit atomic load instead of 16-bit.
+Found by Mohammed Zuhaib.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
