From: Sergey Muraviov <smurav@mail.ru>
Date: Wed, 26 Mar 2025 22:36:04 +0000 (+0300)
Subject: gh-131763: Replace the redundant check with assert in remove_tools (#131765)
X-Git-Tag: v3.14.0a7~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=151d1bfd1bb7ca9a36bb0f2bd6df53d64a1ba2f2;p=thirdparty%2FPython%2Fcpython.git

gh-131763: Replace the redundant check with assert in remove_tools (#131765)
---

diff --git a/Python/instrumentation.c b/Python/instrumentation.c
index bcf7267d23b2..979047cc6fe2 100644
--- a/Python/instrumentation.c
+++ b/Python/instrumentation.c
@@ -833,14 +833,15 @@ remove_tools(PyCodeObject * code, int offset, int event, int tools)
     assert(PY_MONITORING_IS_INSTRUMENTED_EVENT(event));
     assert(opcode_has_event(_Py_GetBaseCodeUnit(code, offset).op.code));
     _PyCoMonitoringData *monitoring = code->_co_monitoring;
+    assert(monitoring);
     bool should_de_instrument;
-    if (monitoring && monitoring->tools) {
+    if (monitoring->tools) {
         monitoring->tools[offset] &= ~tools;
         should_de_instrument = (monitoring->tools[offset] == 0);
     }
     else {
         /* Single tool */
-        uint8_t single_tool = code->_co_monitoring->active_monitors.tools[event];
+        uint8_t single_tool = monitoring->active_monitors.tools[event];
         assert(_Py_popcount32(single_tool) <= 1);
         should_de_instrument = ((single_tool & tools) == single_tool);
     }