https://github.com/python/cpython/commit/f42e112fd86edb5507a38a2eb850d0ebc6bc27a2
commit: f42e112fd86edb5507a38a2eb850d0ebc6bc27a2
branch: main
author: Irit Katriel <[email protected]>
committer: iritkatriel <[email protected]>
date: 2024-02-15T14:32:52Z
summary:
gh-115420: Fix translation of exception hander targets by
_testinternalcapi.optimize_cfg. (#115425)
files:
A Misc/NEWS.d/next/Tests/2024-02-13-18-24-04.gh-issue-115420.-dlzfI.rst
M Lib/test/test_peepholer.py
M Python/flowgraph.c
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
index 2ea186c85c8823..dffedd0b1fc476 100644
--- 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
new file mode 100644
index 00000000000000..1442ada3490fa0
--- /dev/null
+++ 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
index 1a648edf0880c0..4d9ba9eceb8637 100644
--- 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(
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
