Skip to content

gh-120198: Fix crash when two thread edit __class__ #120195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 12 commits into from
Jun 11, 2024
Merged

gh-120198: Fix crash when two thread edit __class__ #120195

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df767e5
Make Py_TYPE and Py_SET_TYPE thread safe
Fidget-Spinner Jun 6, 2024
2e9fda6
fix Windows
Fidget-Spinner Jun 6, 2024
bda9545
add test
Fidget-Spinner Jun 7, 2024
b49dc1a
style nits
Fidget-Spinner Jun 7, 2024
54553a9
remove free-threaded stuff temporarily
Fidget-Spinner Jun 7, 2024
b1dc75b
Remove heap type flags
Fidget-Spinner Jun 7, 2024
5523a9e
Revert "Remove heap type flags"
Fidget-Spinner Jun 7, 2024
02a5587
fix bug
Fidget-Spinner Jun 10, 2024
70523eb
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 10, 2024
1fc5c01
Move test like Steve suggested
Fidget-Spinner Jun 10, 2024
a80f876
Merge branch 'hello' of github.com:Fidget-Spinner/cpython into hello
Fidget-Spinner Jun 10, 2024
b70dc07
skip test if no threads
Fidget-Spinner Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Make Py_TYPE and Py_SET_TYPE thread safe
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Jun 6, 2024
commit df767e58c97f074c6391a228ff3098cabbbdde29
8 changes: 8 additions & 0 deletions Include/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,11 @@ _Py_IsOwnedByCurrentThread(PyObject *ob)

// bpo-39573: The Py_SET_TYPE() function must be used to set an object type.
static inline PyTypeObject* Py_TYPE(PyObject *ob) {
#ifdef Py_GIL_DISABLED
return _Py_atomic_load_ptr_relaxed(&ob->ob_type);
#else
return ob->ob_type;
#endif
}
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
# define Py_TYPE(ob) Py_TYPE(_PyObject_CAST(ob))
Expand Down Expand Up @@ -274,7 +278,11 @@ static inline int Py_IS_TYPE(PyObject *ob, PyTypeObject *type) {


static inline void Py_SET_TYPE(PyObject *ob, PyTypeObject *type) {
#ifdef Py_GIL_DISABLED
_Py_atomic_store_ptr(&ob->ob_type, type);
#else
ob->ob_type = type;
#endif
}
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 < 0x030b0000
# define Py_SET_TYPE(ob, type) Py_SET_TYPE(_PyObject_CAST(ob), type)
Expand Down
2 changes: 0 additions & 2 deletions Tools/tsan/suppressions_free_threading.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ race_top:set_contains_key
# https://gist.github.com/colesbury/d13d033f413b4ad07929d044bed86c35
race_top:set_discard_entry
race_top:set_inheritable
race_top:Py_SET_TYPE
race_top:_PyDict_CheckConsistency
race_top:_PyImport_AcquireLock
race_top:_Py_dict_lookup_threadsafe
Expand All @@ -62,7 +61,6 @@ race_top:_PyFrame_Initialize
race_top:PyInterpreterState_ThreadHead
race_top:_PyObject_TryGetInstanceAttribute
race_top:PyThreadState_Next
race_top:Py_TYPE
race_top:PyUnstable_InterpreterFrame_GetLine
race_top:sock_close
race_top:tstate_delete_common
Expand Down