gh-115420: Fix translation of exception hander targets by _testinternalcapi.optimize_cfg. (#115425)

iritkatriel · web-flow · commit f42e112fd86e · 2024-02-15T14:32:52.000Z
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
@@ -1065,6 +1065,22 @@ def test_conditional_jump_backward_const_condition(self):
         ]
         self.cfg_optimization_test(insts, expected_insts, consts=list(range(5)))
 
+    def test_except_handler_label(self):
+        insts = [
+            ('SETUP_FINALLY', handler := self.Label(), 10),
+            ('POP_BLOCK', 0, -1),
+            ('RETURN_CONST', 1, 11),
+            handler,
+            ('RETURN_CONST', 2, 12),
+        ]
+        expected_insts = [
+            ('SETUP_FINALLY', handler := self.Label(), 10),
+            ('RETURN_CONST', 1, 11),
+            handler,
+            ('RETURN_CONST', 2, 12),
+        ]
+        self.cfg_optimization_test(insts, expected_insts, consts=list(range(5)))
+
     def test_no_unsafe_static_swap(self):
         # We can't change order of two stores to the same location
         insts = [
diff --git a/Misc/NEWS.d/next/Tests/2024-02-13-18-24-04.gh-issue-115420.-dlzfI.rst b/Misc/NEWS.d/next/Tests/2024-02-13-18-24-04.gh-issue-115420.-dlzfI.rst
@@ -0,0 +1,2 @@
+Fix translation of exception hander targets by
+``_testinternalcapi.optimize_cfg``.
diff --git a/Python/flowgraph.c b/Python/flowgraph.c
@@ -2729,7 +2729,7 @@ _PyCfg_ToInstructionSequence(cfg_builder *g, _PyCompile_InstructionSequence *seq
         RETURN_IF_ERROR(_PyCompile_InstructionSequence_UseLabel(seq, b->b_label.id));
         for (int i = 0; i < b->b_iused; i++) {
             cfg_instr *instr = &b->b_instr[i];
-            if (OPCODE_HAS_JUMP(instr->i_opcode)) {
+            if (OPCODE_HAS_JUMP(instr->i_opcode) || is_block_push(instr)) {
                 instr->i_oparg = instr->i_target->b_label.id;
             }
             RETURN_IF_ERROR(

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix translation of exception hander targets by`
	`2`	+``_testinternalcapi.optimize_cfg``.
Original file line number	Diff line number	Diff line change
`@@ -2729,7 +2729,7 @@ _PyCfg_ToInstructionSequence(cfg_builder g, _PyCompile_InstructionSequence seq`
`2729`	`2729`	`RETURN_IF_ERROR(_PyCompile_InstructionSequence_UseLabel(seq, b->b_label.id));`
`2730`	`2730`	`for (int i = 0; i < b->b_iused; i++) {`
`2731`	`2731`	`cfg_instr *instr = &b->b_instr[i];`
`2732`		`- if (OPCODE_HAS_JUMP(instr->i_opcode)) {`
	`2732`	`+ if (OPCODE_HAS_JUMP(instr->i_opcode) \|\| is_block_push(instr)) {`
`2733`	`2733`	`instr->i_oparg = instr->i_target->b_label.id;`
`2734`	`2734`	`}`
`2735`	`2735`	`RETURN_IF_ERROR(`