Account for specialization when scanning for branches.

markshannon · markshannon · commit 04991a22b572 · 2024-08-15T10:58:48.000+01:00
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -2912,7 +2912,7 @@ branchesiter_next(branchesiterator *bi)
 {
     int offset = bi->bi_offset;
     while (offset < Py_SIZE(bi->bi_code)) {
-        _Py_CODEUNIT inst = _PyCode_CODE(bi->bi_code)[offset];
+        _Py_CODEUNIT inst = _Py_GetBaseCodeUnit(bi->bi_code, offset);
         int next_offset = offset + _PyInstruction_GetLength(bi->bi_code, offset);
         int event = EVENT_FOR_OPCODE[inst.op.code];
         if (event == PY_MONITORING_EVENT_BRANCH_TAKEN) {

Original file line number	Diff line number	Diff line change
`@@ -2912,7 +2912,7 @@ branchesiter_next(branchesiterator *bi)`
`2912`	`2912`	`{`
`2913`	`2913`	`int offset = bi->bi_offset;`
`2914`	`2914`	`while (offset < Py_SIZE(bi->bi_code)) {`
`2915`		`- _Py_CODEUNIT inst = _PyCode_CODE(bi->bi_code)[offset];`
	`2915`	`+ _Py_CODEUNIT inst = _Py_GetBaseCodeUnit(bi->bi_code, offset);`
`2916`	`2916`	`int next_offset = offset + _PyInstruction_GetLength(bi->bi_code, offset);`
`2917`	`2917`	`int event = EVENT_FOR_OPCODE[inst.op.code];`
`2918`	`2918`	`if (event == PY_MONITORING_EVENT_BRANCH_TAKEN) {`