Tidy up debug code

Author: markshannon

Lib/test/test_monitoring.py

@@ -1706,7 +1706,7 @@ def check_branches(self, run_func, test_func=None, tool=TEST_TOOL, recorders=BRA
                 rights.add((src, right))
             print(event_list)
             for event in event_list:
-                way, name, src, dest = event
+                way, _, src, dest = event
                 if "left" in way:
                     self.assertIn((src, dest), lefts)
                 else:
@@ -1782,7 +1782,6 @@ def func():
             except StopIteration:
                 pass
 
-        print(list(foo.__code__.co_branches()))
         self.check_branches(func, foo)
 
 

Python/assemble.c

@@ -675,7 +675,7 @@ resolve_jump_offsets(instr_sequence *instrs)
                 instruction *target = &instrs->s_instrs[instr->i_target];
                 instr->i_oparg = target->i_offset;
                 if (instr->i_opcode == END_ASYNC_FOR) {
-                    // Adjust the offset so that target is the END_SEND
+                    // Monitoring needs the target to be the END_SEND
                     instr->i_oparg = offset - instr->i_oparg - END_SEND_OFFSET;
                 }
                 else if (instr->i_oparg < offset) {

Python/instruction_sequence.c

@@ -29,7 +29,6 @@ typedef _Py_SourceLocation location;
 
 #define RETURN_IF_ERROR(X)  \
     if ((X) == -1) {        \
-        assert(PyErr_Occurred()); \
         return ERROR;       \
     }