Resolved merge conflict in Tools/tsan/suppressions_free_threading.txt

SonicField · SonicField · commit e9bae12acd4e · 2024-04-26T09:48:18.000-07:00
diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst
@@ -279,7 +279,7 @@ Data Types
          >>> Color.RED.value
          1
 
-      Value of the member, can be set in :meth:`~object.__new__`.
+      Value of the member, can be set in :meth:`~Enum.__new__`.
 
       .. note:: Enum member values
 
@@ -299,7 +299,7 @@ Data Types
 
    .. attribute:: Enum._value_
 
-      Value of the member, can be set in :meth:`~object.__new__`.
+      Value of the member, can be set in :meth:`~Enum.__new__`.
 
    .. attribute:: Enum._order_
 
@@ -407,8 +407,8 @@ Data Types
 
       results in the call ``int('1a', 16)`` and a value of ``17`` for the member.
 
-      ..note:: When writing a custom ``__new__``, do not use ``super().__new__`` --
-               call the appropriate ``__new__`` instead.
+      .. note:: When writing a custom ``__new__``, do not use ``super().__new__`` --
+                call the appropriate ``__new__`` instead.
 
    .. method:: Enum.__repr__(self)
 
@@ -827,7 +827,7 @@ Supported ``__dunder__`` names
 :attr:`~EnumType.__members__` is a read-only ordered mapping of ``member_name``:``member``
 items.  It is only available on the class.
 
-:meth:`~object.__new__`, if specified, must create and return the enum members;
+:meth:`~Enum.__new__`, if specified, must create and return the enum members;
 it is also a very good idea to set the member's :attr:`!_value_` appropriately.
 Once all the members are created it is no longer used.
 
diff --git a/Include/object.h b/Include/object.h
@@ -303,7 +303,11 @@ _Py_ThreadId(void)
 static inline Py_ALWAYS_INLINE int
 _Py_IsOwnedByCurrentThread(PyObject *ob)
 {
+#ifdef _Py_THREAD_SANITIZER
+    return _Py_atomic_load_uintptr_relaxed(&ob->ob_tid) == _Py_ThreadId();
+#else
     return ob->ob_tid == _Py_ThreadId();
+#endif
 }
 #endif
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-03-30-00-37-53.gh-issue-117385.h0OJti.rst b/Misc/NEWS.d/next/Core and Builtins/2024-03-30-00-37-53.gh-issue-117385.h0OJti.rst
@@ -0,0 +1 @@
+Remove unhandled ``PY_MONITORING_EVENT_BRANCH`` and ``PY_MONITORING_EVENT_EXCEPTION_HANDLED`` events from :func:`sys.settrace`.
diff --git a/Python/instruction_sequence.c b/Python/instruction_sequence.c
@@ -20,6 +20,8 @@ typedef _Py_SourceLocation location;
 #define INITIAL_INSTR_SEQUENCE_SIZE 100
 #define INITIAL_INSTR_SEQUENCE_LABELS_MAP_SIZE 10
 
+#include "clinic/instruction_sequence.c.h"
+
 #undef SUCCESS
 #undef ERROR
 #define SUCCESS 0
@@ -172,8 +174,6 @@ class InstructionSequenceType "_PyInstructionSequence *" "&_PyInstructionSequenc
 [clinic start generated code]*/
 /*[clinic end generated code: output=da39a3ee5e6b4b0d input=589963e07480390f]*/
 
-#include "clinic/instruction_sequence.c.h"
-
 static _PyInstructionSequence*
 inst_seq_create(void)
 {
diff --git a/Python/legacy_tracing.c b/Python/legacy_tracing.c
@@ -599,10 +599,9 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
             (1 << PY_MONITORING_EVENT_PY_START) | (1 << PY_MONITORING_EVENT_PY_RESUME) |
             (1 << PY_MONITORING_EVENT_PY_RETURN) | (1 << PY_MONITORING_EVENT_PY_YIELD) |
             (1 << PY_MONITORING_EVENT_RAISE) | (1 << PY_MONITORING_EVENT_LINE) |
-            (1 << PY_MONITORING_EVENT_JUMP) | (1 << PY_MONITORING_EVENT_BRANCH) |
+            (1 << PY_MONITORING_EVENT_JUMP) |
             (1 << PY_MONITORING_EVENT_PY_UNWIND) | (1 << PY_MONITORING_EVENT_PY_THROW) |
-            (1 << PY_MONITORING_EVENT_STOP_ITERATION) |
-            (1 << PY_MONITORING_EVENT_EXCEPTION_HANDLED);
+            (1 << PY_MONITORING_EVENT_STOP_ITERATION);
 
         PyFrameObject* frame = PyEval_GetFrame();
         if (frame->f_trace_opcodes) {

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,11 @@ _Py_ThreadId(void)`
`303`	`303`	`static inline Py_ALWAYS_INLINE int`
`304`	`304`	`_Py_IsOwnedByCurrentThread(PyObject *ob)`
`305`	`305`	`{`
	`306`	`+#ifdef _Py_THREAD_SANITIZER`
	`307`	`+ return _Py_atomic_load_uintptr_relaxed(&ob->ob_tid) == _Py_ThreadId();`
	`308`	`+#else`
`306`	`309`	`return ob->ob_tid == _Py_ThreadId();`
	`310`	`+#endif`
`307`	`311`	`}`
`308`	`312`	`#endif`
`309`	`313`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Remove unhandled ``PY_MONITORING_EVENT_BRANCH`` and ``PY_MONITORING_EVENT_EXCEPTION_HANDLED`` events from :func:`sys.settrace`.