gh-103082: remove assumption that INSTRUMENTED_LINE is the last instrumented opcode (#107978)

iritkatriel · web-flow · commit 971a4c27517e · 2023-08-15T16:40:05.000+01:00
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -121,7 +121,7 @@ static inline bool
 opcode_has_event(int opcode)
 {
     return (
-        opcode < INSTRUMENTED_LINE &&
+        opcode != INSTRUMENTED_LINE &&
         INSTRUMENTED_OPCODES[opcode] > 0
     );
 }
@@ -1202,7 +1202,7 @@ _Py_call_instrumentation_line(PyThreadState *tstate, _PyInterpreterFrame* frame,
     Py_DECREF(line_obj);
 done:
     assert(original_opcode != 0);
-    assert(original_opcode < INSTRUMENTED_LINE);
+    assert(original_opcode != INSTRUMENTED_LINE);
     assert(_PyOpcode_Deopt[original_opcode] == original_opcode);
     return original_opcode;
 }

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ static inline bool`
`121`	`121`	`opcode_has_event(int opcode)`
`122`	`122`	`{`
`123`	`123`	`return (`
`124`		`- opcode < INSTRUMENTED_LINE &&`
	`124`	`+ opcode != INSTRUMENTED_LINE &&`
`125`	`125`	`INSTRUMENTED_OPCODES[opcode] > 0`
`126`	`126`	`);`
`127`	`127`	`}`
`@@ -1202,7 +1202,7 @@ _Py_call_instrumentation_line(PyThreadState tstate, _PyInterpreterFrame frame,`
`1202`	`1202`	`Py_DECREF(line_obj);`
`1203`	`1203`	`done:`
`1204`	`1204`	`assert(original_opcode != 0);`
`1205`		`- assert(original_opcode < INSTRUMENTED_LINE);`
	`1205`	`+ assert(original_opcode != INSTRUMENTED_LINE);`
`1206`	`1206`	`assert(_PyOpcode_Deopt[original_opcode] == original_opcode);`
`1207`	`1207`	`return original_opcode;`
`1208`	`1208`	`}`