Prevent deinstrumenting INSTRUCTION from deinstrumenting LINE

Author: gaogaotiantian

Lib/test/test_monitoring.py

@@ -1152,6 +1152,23 @@ def func1():
             ('instruction', 'func1', 14),
             ('line', 'get_events', 11)])
 
+    def test_turn_off_only_instruction(self):
+        """
+        LINE events should be recorded after INSTRUCTION event is turned off
+        """
+        events = []
+        def line(*args):
+            events.append("line")
+        sys.monitoring.set_events(TEST_TOOL, 0)
+        sys.monitoring.register_callback(TEST_TOOL, E.LINE, line)
+        sys.monitoring.register_callback(TEST_TOOL, E.INSTRUCTION, lambda *args: None)
+        sys.monitoring.set_events(TEST_TOOL, E.LINE | E.INSTRUCTION)
+        sys.monitoring.set_events(TEST_TOOL, E.LINE)
+        events = []
+        a = 0
+        sys.monitoring.set_events(TEST_TOOL, 0)
+        self.assertGreater(len(events), 0)
+
 class TestInstallIncrementallly(MonitoringTestBase, unittest.TestCase):
 
     def check_events(self, func, must_include, tool=TEST_TOOL, recorders=(ExceptionRecorder,)):

Python/instrumentation.c

@@ -630,21 +630,26 @@ static void
 de_instrument_per_instruction(PyCodeObject *code, int i)
 {
     _Py_CODEUNIT *instr = &_PyCode_CODE(code)[i];
-    uint8_t *opcode_ptr = &instr->op.code;
-    int opcode =*opcode_ptr;
+    int opcode = instr->op.code;
     if (opcode == INSTRUMENTED_LINE) {
-        opcode_ptr = &code->_co_monitoring->lines[i].original_opcode;
-        opcode = *opcode_ptr;
-    }
-    if (opcode != INSTRUMENTED_INSTRUCTION) {
-        return;
-    }
-    int original_opcode = code->_co_monitoring->per_instruction_opcodes[i];
-    CHECK(original_opcode != 0);
-    CHECK(original_opcode == _PyOpcode_Deopt[original_opcode]);
-    instr->op.code = original_opcode;
-    if (_PyOpcode_Caches[original_opcode]) {
-        instr[1].cache = adaptive_counter_warmup();
+        // We need to keep INSTRUMENTED_LINE when deinstrumenting INSTRUCTION
+        opcode = code->_co_monitoring->lines[i].original_opcode;
+        if (opcode != INSTRUMENTED_INSTRUCTION) {
+            return;
+        }
+        code->_co_monitoring->lines[i].original_opcode =
+                code->_co_monitoring->per_instruction_opcodes[i];
+    } else {
+        if (opcode != INSTRUMENTED_INSTRUCTION) {
+            return;
+        }
+        int original_opcode = code->_co_monitoring->per_instruction_opcodes[i];
+        CHECK(original_opcode != 0);
+        CHECK(original_opcode == _PyOpcode_Deopt[original_opcode]);
+        instr->op.code = original_opcode;
+        if (_PyOpcode_Caches[original_opcode]) {
+            instr[1].cache = adaptive_counter_warmup();
+        }
     }
     assert(instr->op.code != INSTRUMENTED_INSTRUCTION);
     /* Keep things clean for sanity check */