https://github.com/python/cpython/commit/c4303763dac4494300e299e54c079a4a11931a55
commit: c4303763dac4494300e299e54c079a4a11931a55
branch: main
author: mpage <[email protected]>
committer: mpage <[email protected]>
date: 2024-12-02T10:13:30-08:00
summary:
gh-127411: Fix invalid conversion of load of TLBC array when compiled in C++
(#127466)
Cast the result of the load to the correct type
files:
M Include/internal/pycore_code.h
M Include/internal/pycore_frame.h
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index a0acf76db6f04d..d607a54aa4a2f5 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -609,12 +609,19 @@ PyAPI_DATA(const struct _PyCode8) _Py_InitCleanup;
#ifdef Py_GIL_DISABLED
+static inline _PyCodeArray *
+_PyCode_GetTLBCArray(PyCodeObject *co)
+{
+ return _Py_STATIC_CAST(_PyCodeArray *,
+ _Py_atomic_load_ptr_acquire(&co->co_tlbc));
+}
+
// Return a pointer to the thread-local bytecode for the current thread, if it
// exists.
static inline _Py_CODEUNIT *
_PyCode_GetTLBCFast(PyThreadState *tstate, PyCodeObject *co)
{
- _PyCodeArray *code = _Py_atomic_load_ptr_acquire(&co->co_tlbc);
+ _PyCodeArray *code = _PyCode_GetTLBCArray(co);
int32_t idx = ((_PyThreadStateImpl*) tstate)->tlbc_index;
if (idx < code->size && code->entries[idx] != NULL) {
return (_Py_CODEUNIT *) code->entries[idx];
diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h
index b786c5f49e9831..96ae4dd22ecb43 100644
--- a/Include/internal/pycore_frame.h
+++ b/Include/internal/pycore_frame.h
@@ -94,7 +94,7 @@ _PyFrame_GetBytecode(_PyInterpreterFrame *f)
{
#ifdef Py_GIL_DISABLED
PyCodeObject *co = _PyFrame_GetCode(f);
- _PyCodeArray *tlbc = _Py_atomic_load_ptr_acquire(&co->co_tlbc);
+ _PyCodeArray *tlbc = _PyCode_GetTLBCArray(co);
assert(f->tlbc_index >= 0 && f->tlbc_index < tlbc->size);
return (_Py_CODEUNIT *)tlbc->entries[f->tlbc_index];
#else
_______________________________________________
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]
