[Python-checkins] bpo-46528: Simplify BUILD_TUPLE/UNPACK_SEQUENCE folding (GH-31039)
brandtbucher
webhook-mailer at python.org
Tue Feb 1 16:41:43 EST 2022
https://github.com/python/cpython/commit/a0e55a571cf01885fd5826266c37abaee307c309
commit: a0e55a571cf01885fd5826266c37abaee307c309
branch: main
author: Brandt Bucher <brandt at python.org>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-02-01T13:41:32-08:00
summary:
bpo-46528: Simplify BUILD_TUPLE/UNPACK_SEQUENCE folding (GH-31039)
files:
M Lib/test/test_peepholer.py
M Python/compile.c
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
index 659f654b5c676..2df5883ce7918 100644
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -126,7 +126,7 @@ def test_pack_unpack(self):
code = compile(line,'','single')
self.assertInBytecode(code, elem)
self.assertNotInBytecode(code, 'BUILD_TUPLE')
- self.assertNotInBytecode(code, 'UNPACK_TUPLE')
+ self.assertNotInBytecode(code, 'UNPACK_SEQUENCE')
self.check_lnotab(code)
def test_folding_of_tuples_of_constants(self):
diff --git a/Python/compile.c b/Python/compile.c
index eda708e21f16a..1d2d567e85e93 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -8661,29 +8661,22 @@ optimize_basic_block(struct compiler *c, basicblock *bb, PyObject *consts)
}
/* Try to fold tuples of constants.
- Skip over BUILD_SEQN 1 UNPACK_SEQN 1.
- Replace BUILD_SEQN 2 UNPACK_SEQN 2 with ROT2.
- Replace BUILD_SEQN 3 UNPACK_SEQN 3 with ROT3 ROT2. */
+ Skip over BUILD_TUPLE(1) UNPACK_SEQUENCE(1).
+ Replace BUILD_TUPLE(2) UNPACK_SEQUENCE(2) with SWAP(2).
+ Replace BUILD_TUPLE(3) UNPACK_SEQUENCE(3) with SWAP(3). */
case BUILD_TUPLE:
if (nextop == UNPACK_SEQUENCE && oparg == bb->b_instr[i+1].i_oparg) {
switch(oparg) {
case 1:
inst->i_opcode = NOP;
bb->b_instr[i+1].i_opcode = NOP;
- break;
+ continue;
case 2:
- inst->i_opcode = SWAP;
- inst->i_oparg = 2;
- bb->b_instr[i+1].i_opcode = NOP;
- i--;
- break;
case 3:
- inst->i_opcode = SWAP;
- inst->i_oparg = 3;
- bb->b_instr[i+1].i_opcode = NOP;
- i--;
+ inst->i_opcode = NOP;
+ bb->b_instr[i+1].i_opcode = SWAP;
+ continue;
}
- break;
}
if (i >= oparg) {
if (fold_tuple_on_constants(c, inst-oparg, oparg, consts)) {
More information about the Python-checkins
mailing list