Skip to content

Commit dd207a6

Browse files
iritkatrieliritkatriel
authored
bpo-47120: make POP_JUMP_IF_TRUE/FALSE/NONE/NOT_NONE relative (GH-32400)
1 parent 98ff4a6 commit dd207a6

File tree

14 files changed

+349
-127
lines changed

14 files changed

+349
-127
lines changed

‎Doc/library/dis.rst

+38-10
Original file line numberDiff line numberDiff line change
@@ -937,30 +937,58 @@ iterations of the loop.
937937
.. versionadded:: 3.11
938938

939939

940-
.. opcode:: POP_JUMP_IF_TRUE (target)
940+
.. opcode:: POP_JUMP_FORWARD_IF_TRUE (delta)
941941

942-
If TOS is true, sets the bytecode counter to *target*. TOS is popped.
942+
If TOS is true, increments the bytecode counter by *delta*. TOS is popped.
943943

944-
.. versionadded:: 3.1
944+
.. versionadded:: 3.11
945945

946946

947-
.. opcode:: POP_JUMP_IF_FALSE (target)
947+
.. opcode:: POP_JUMP_BACKWARD_IF_TRUE (delta)
948948

949-
If TOS is false, sets the bytecode counter to *target*. TOS is popped.
949+
If TOS is true, decrements the bytecode counter by *delta*. TOS is popped.
950950

951-
.. versionadded:: 3.1
951+
.. versionadded:: 3.11
952+
953+
954+
.. opcode:: POP_JUMP_FORWARD_IF_FALSE (delta)
955+
956+
If TOS is false, increments the bytecode counter by *delta*. TOS is popped.
957+
958+
.. versionadded:: 3.11
959+
960+
961+
.. opcode:: POP_JUMP_BACKWARD_IF_FALSE (delta)
962+
963+
If TOS is false, decrements the bytecode counter by *delta*. TOS is popped.
964+
965+
.. versionadded:: 3.11
966+
967+
968+
.. opcode:: POP_JUMP_FORWARD_IF_NOT_NONE (delta)
969+
970+
If TOS is not ``None``, increments the bytecode counter by *delta*. TOS is popped.
971+
972+
.. versionadded:: 3.11
973+
974+
975+
.. opcode:: POP_JUMP_BACKWARD_IF_NOT_NONE (delta)
976+
977+
If TOS is not ``None``, decrements the bytecode counter by *delta*. TOS is popped.
978+
979+
.. versionadded:: 3.11
952980

953981

954-
.. opcode:: POP_JUMP_IF_NOT_NONE (target)
982+
.. opcode:: POP_JUMP_FORWARD_IF_NONE (delta)
955983

956-
If TOS is not none, sets the bytecode counter to *target*. TOS is popped.
984+
If TOS is ``None``, increments the bytecode counter by *delta*. TOS is popped.
957985

958986
.. versionadded:: 3.11
959987

960988

961-
.. opcode:: POP_JUMP_IF_NONE (target)
989+
.. opcode:: POP_JUMP_BACKWARD_IF_NONE (delta)
962990

963-
If TOS is none, sets the bytecode counter to *target*. TOS is popped.
991+
If TOS is ``None``, decrements the bytecode counter by *delta*. TOS is popped.
964992

965993
.. versionadded:: 3.11
966994

‎Doc/whatsnew/3.11.rst

+11-4
Original file line numberDiff line numberDiff line change
@@ -750,9 +750,6 @@ CPython bytecode changes
750750
``ROT_TWO``, ``ROT_THREE``, ``ROT_FOUR``, and ``ROT_N``) with new
751751
:opcode:`COPY` and :opcode:`SWAP` instructions.
752752

753-
* Add :opcode:`POP_JUMP_IF_NOT_NONE` and :opcode:`POP_JUMP_IF_NONE` opcodes to
754-
speed up conditional jumps.
755-
756753
* Replaced :opcode:`JUMP_IF_NOT_EXC_MATCH` by :opcode:`CHECK_EXC_MATCH` which
757754
performs the check but does not jump.
758755

@@ -761,7 +758,17 @@ CPython bytecode changes
761758

762759
* Replaced :opcode:`JUMP_ABSOLUTE` by the relative :opcode:`JUMP_BACKWARD`.
763760

764-
* Added :opcode:`JUMP_BACKWARD_NO_INTERRUPT`, which is used in certain loops where it is undesirable to handle interrupts.
761+
* Added :opcode:`JUMP_BACKWARD_NO_INTERRUPT`, which is used in certain loops where it
762+
is undesirable to handle interrupts.
763+
764+
* Replaced :opcode:`POP_JUMP_IF_TRUE` and :opcode:`POP_JUMP_IF_FALSE` by
765+
the relative :opcode:`POP_JUMP_FORWARD_IF_TRUE`, :opcode:`POP_JUMP_BACKWARD_IF_TRUE`,
766+
:opcode:`POP_JUMP_FORWARD_IF_FALSE` and :opcode:`POP_JUMP_BACKWARD_IF_FALSE`.
767+
768+
* Added :opcode:`POP_JUMP_FORWARD_IF_NOT_NONE`, :opcode:`POP_JUMP_BACKWARD_IF_NOT_NONE`,
769+
:opcode:`POP_JUMP_FORWARD_IF_NONE` and :opcode:`POP_JUMP_BACKWARD_IF_NONE`
770+
opcodes to speed up conditional jumps.
771+
765772

766773
Deprecated
767774
==========

‎Include/opcode.h

+23-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Lib/dis.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,9 @@ def parse_exception_table(code):
392392
except StopIteration:
393393
return entries
394394

395+
def _is_backward_jump(op):
396+
return 'JUMP_BACKWARD' in opname[op]
397+
395398
def _get_instructions_bytes(code, varname_from_oparg=None,
396399
names=None, co_consts=None,
397400
linestarts=None, line_offset=0,
@@ -442,7 +445,7 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
442445
argval = arg*2
443446
argrepr = "to " + repr(argval)
444447
elif op in hasjrel:
445-
signed_arg = -arg if op == JUMP_BACKWARD else arg
448+
signed_arg = -arg if _is_backward_jump(op) else arg
446449
argval = offset + 2 + signed_arg*2
447450
argrepr = "to " + repr(argval)
448451
elif op in haslocal or op in hasfree:
@@ -568,7 +571,7 @@ def findlabels(code):
568571
for offset, op, arg in _unpack_opargs(code):
569572
if arg is not None:
570573
if op in hasjrel:
571-
if op == JUMP_BACKWARD:
574+
if _is_backward_jump(op):
572575
arg = -arg
573576
label = offset + 2 + arg*2
574577
elif op in hasjabs:

‎Lib/importlib/_bootstrap_external.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ def _write_atomic(path, data, mode=0o666):
400400
# Python 3.11a6 3490 (remove JUMP_IF_NOT_EXC_MATCH, add CHECK_EXC_MATCH)
401401
# Python 3.11a6 3491 (remove JUMP_IF_NOT_EG_MATCH, add CHECK_EG_MATCH,
402402
# add JUMP_BACKWARD_NO_INTERRUPT, make JUMP_NO_INTERRUPT virtual)
403+
# Python 3.11a7 3492 (make POP_JUMP_IF_NONE/NOT_NONE/TRUE/FALSE relative)
403404

404405
# Python 3.12 will start with magic number 3500
405406

@@ -414,7 +415,7 @@ def _write_atomic(path, data, mode=0o666):
414415
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
415416
# in PC/launcher.c must also be updated.
416417

417-
MAGIC_NUMBER = (3491).to_bytes(2, 'little') + b'\r\n'
418+
MAGIC_NUMBER = (3492).to_bytes(2, 'little') + b'\r\n'
418419
_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
419420

420421
_PYCACHE = '__pycache__'

‎Lib/opcode.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ def jabs_op(name, op, entries=0):
133133
jrel_op('JUMP_FORWARD', 110) # Number of words to skip
134134
jabs_op('JUMP_IF_FALSE_OR_POP', 111) # Target byte offset from beginning of code
135135
jabs_op('JUMP_IF_TRUE_OR_POP', 112) # ""
136-
jabs_op('POP_JUMP_IF_FALSE', 114) # ""
137-
jabs_op('POP_JUMP_IF_TRUE', 115) # ""
136+
jrel_op('POP_JUMP_FORWARD_IF_FALSE', 114)
137+
jrel_op('POP_JUMP_FORWARD_IF_TRUE', 115)
138138
name_op('LOAD_GLOBAL', 116, 5) # Index in name list
139139
def_op('IS_OP', 117)
140140
def_op('CONTAINS_OP', 118)
@@ -148,8 +148,8 @@ def jabs_op(name, op, entries=0):
148148
haslocal.append(125)
149149
def_op('DELETE_FAST', 126) # Local variable number
150150
haslocal.append(126)
151-
jabs_op('POP_JUMP_IF_NOT_NONE', 128)
152-
jabs_op('POP_JUMP_IF_NONE', 129)
151+
jrel_op('POP_JUMP_FORWARD_IF_NOT_NONE', 128)
152+
jrel_op('POP_JUMP_FORWARD_IF_NONE', 129)
153153
def_op('RAISE_VARARGS', 130) # Number of raise arguments (1, 2, or 3)
154154
def_op('GET_AWAITABLE', 131)
155155
def_op('MAKE_FUNCTION', 132) # Flags
@@ -197,6 +197,11 @@ def jabs_op(name, op, entries=0):
197197
def_op('KW_NAMES', 172)
198198
hasconst.append(172)
199199

200+
jrel_op('POP_JUMP_BACKWARD_IF_NOT_NONE', 173)
201+
jrel_op('POP_JUMP_BACKWARD_IF_NONE', 174)
202+
jrel_op('POP_JUMP_BACKWARD_IF_FALSE', 175)
203+
jrel_op('POP_JUMP_BACKWARD_IF_TRUE', 176)
204+
200205

201206
del def_op, name_op, jrel_op, jabs_op
202207

‎Lib/test/test_dis.py

+18-10
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ def bug42562():
373373
374374
%3d LOAD_GLOBAL 0 (Exception)
375375
CHECK_EXC_MATCH
376-
POP_JUMP_IF_FALSE 36 (to 72)
376+
POP_JUMP_FORWARD_IF_FALSE 18 (to 72)
377377
STORE_FAST 0 (e)
378378
379379
%3d LOAD_FAST 0 (e)
@@ -685,7 +685,15 @@ def test_widths(self):
685685
for opcode, opname in enumerate(dis.opname):
686686
if opname in ('BUILD_MAP_UNPACK_WITH_CALL',
687687
'BUILD_TUPLE_UNPACK_WITH_CALL',
688-
'JUMP_BACKWARD_NO_INTERRUPT'):
688+
'JUMP_BACKWARD_NO_INTERRUPT',
689+
'POP_JUMP_FORWARD_IF_NONE',
690+
'POP_JUMP_BACKWARD_IF_NONE',
691+
'POP_JUMP_FORWARD_IF_NOT_NONE',
692+
'POP_JUMP_BACKWARD_IF_NOT_NONE',
693+
'POP_JUMP_FORWARD_IF_TRUE',
694+
'POP_JUMP_BACKWARD_IF_TRUE',
695+
'POP_JUMP_FORWARD_IF_FALSE',
696+
'POP_JUMP_BACKWARD_IF_FALSE'):
689697
continue
690698
with self.subTest(opname=opname):
691699
width = dis._OPNAME_WIDTH
@@ -1227,12 +1235,12 @@ def _prepare_test_cases():
12271235
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=66, starts_line=5, is_jump_target=False, positions=None),
12281236
Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=68, starts_line=None, is_jump_target=False, positions=None),
12291237
Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=70, starts_line=None, is_jump_target=False, positions=None),
1230-
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=40, argval=80, argrepr='to 80', offset=76, starts_line=None, is_jump_target=False, positions=None),
1238+
Instruction(opname='POP_JUMP_FORWARD_IF_FALSE', opcode=114, arg=1, argval=80, argrepr='to 80', offset=76, starts_line=None, is_jump_target=False, positions=None),
12311239
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=24, argval=32, argrepr='to 32', offset=78, starts_line=6, is_jump_target=False, positions=None),
12321240
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=80, starts_line=7, is_jump_target=True, positions=None),
12331241
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=82, starts_line=None, is_jump_target=False, positions=None),
12341242
Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=84, starts_line=None, is_jump_target=False, positions=None),
1235-
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=48, argval=96, argrepr='to 96', offset=90, starts_line=None, is_jump_target=False, positions=None),
1243+
Instruction(opname='POP_JUMP_FORWARD_IF_FALSE', opcode=114, arg=2, argval=96, argrepr='to 96', offset=90, starts_line=None, is_jump_target=False, positions=None),
12361244
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=92, starts_line=8, is_jump_target=False, positions=None),
12371245
Instruction(opname='JUMP_FORWARD', opcode=110, arg=16, argval=128, argrepr='to 128', offset=94, starts_line=None, is_jump_target=False, positions=None),
12381246
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=33, argval=32, argrepr='to 32', offset=96, starts_line=7, is_jump_target=True, positions=None),
@@ -1242,7 +1250,7 @@ def _prepare_test_cases():
12421250
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=116, starts_line=None, is_jump_target=False, positions=None),
12431251
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=126, starts_line=None, is_jump_target=False, positions=None),
12441252
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=128, starts_line=11, is_jump_target=True, positions=None),
1245-
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=102, argval=204, argrepr='to 204', offset=130, starts_line=None, is_jump_target=False, positions=None),
1253+
Instruction(opname='POP_JUMP_FORWARD_IF_FALSE', opcode=114, arg=36, argval=204, argrepr='to 204', offset=130, starts_line=None, is_jump_target=False, positions=None),
12461254
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=132, starts_line=12, is_jump_target=True, positions=None),
12471255
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=144, starts_line=None, is_jump_target=False, positions=None),
12481256
Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=146, starts_line=None, is_jump_target=False, positions=None),
@@ -1255,15 +1263,15 @@ def _prepare_test_cases():
12551263
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=172, starts_line=14, is_jump_target=False, positions=None),
12561264
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=174, starts_line=None, is_jump_target=False, positions=None),
12571265
Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=176, starts_line=None, is_jump_target=False, positions=None),
1258-
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=93, argval=186, argrepr='to 186', offset=182, starts_line=None, is_jump_target=False, positions=None),
1266+
Instruction(opname='POP_JUMP_FORWARD_IF_FALSE', opcode=114, arg=1, argval=186, argrepr='to 186', offset=182, starts_line=None, is_jump_target=False, positions=None),
12591267
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=29, argval=128, argrepr='to 128', offset=184, starts_line=15, is_jump_target=False, positions=None),
12601268
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=186, starts_line=16, is_jump_target=True, positions=None),
12611269
Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=188, starts_line=None, is_jump_target=False, positions=None),
12621270
Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=190, starts_line=None, is_jump_target=False, positions=None),
1263-
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=100, argval=200, argrepr='to 200', offset=196, starts_line=None, is_jump_target=False, positions=None),
1271+
Instruction(opname='POP_JUMP_FORWARD_IF_FALSE', opcode=114, arg=1, argval=200, argrepr='to 200', offset=196, starts_line=None, is_jump_target=False, positions=None),
12641272
Instruction(opname='JUMP_FORWARD', opcode=110, arg=17, argval=234, argrepr='to 234', offset=198, starts_line=17, is_jump_target=False, positions=None),
12651273
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=200, starts_line=11, is_jump_target=True, positions=None),
1266-
Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=66, argval=132, argrepr='to 132', offset=202, starts_line=None, is_jump_target=False, positions=None),
1274+
Instruction(opname='POP_JUMP_BACKWARD_IF_TRUE', opcode=176, arg=36, argval=132, argrepr='to 132', offset=202, starts_line=None, is_jump_target=False, positions=None),
12671275
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=204, starts_line=19, is_jump_target=True, positions=None),
12681276
Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=216, starts_line=None, is_jump_target=False, positions=None),
12691277
Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=218, starts_line=None, is_jump_target=False, positions=None),
@@ -1291,7 +1299,7 @@ def _prepare_test_cases():
12911299
Instruction(opname='JUMP_FORWARD', opcode=110, arg=11, argval=328, argrepr='to 328', offset=304, starts_line=None, is_jump_target=False, positions=None),
12921300
Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=306, starts_line=None, is_jump_target=False, positions=None),
12931301
Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=308, starts_line=None, is_jump_target=False, positions=None),
1294-
Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=160, argval=320, argrepr='to 320', offset=310, starts_line=None, is_jump_target=False, positions=None),
1302+
Instruction(opname='POP_JUMP_FORWARD_IF_TRUE', opcode=115, arg=4, argval=320, argrepr='to 320', offset=310, starts_line=None, is_jump_target=False, positions=None),
12951303
Instruction(opname='RERAISE', opcode=119, arg=2, argval=2, argrepr='', offset=312, starts_line=None, is_jump_target=False, positions=None),
12961304
Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=314, starts_line=None, is_jump_target=False, positions=None),
12971305
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=316, starts_line=None, is_jump_target=False, positions=None),
@@ -1304,7 +1312,7 @@ def _prepare_test_cases():
13041312
Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=330, starts_line=None, is_jump_target=False, positions=None),
13051313
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=4, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=332, starts_line=22, is_jump_target=False, positions=None),
13061314
Instruction(opname='CHECK_EXC_MATCH', opcode=36, arg=None, argval=None, argrepr='', offset=344, starts_line=None, is_jump_target=False, positions=None),
1307-
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=192, argval=384, argrepr='to 384', offset=346, starts_line=None, is_jump_target=False, positions=None),
1315+
Instruction(opname='POP_JUMP_FORWARD_IF_FALSE', opcode=114, arg=18, argval=384, argrepr='to 384', offset=346, starts_line=None, is_jump_target=False, positions=None),
13081316
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=348, starts_line=None, is_jump_target=False, positions=None),
13091317
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=350, starts_line=23, is_jump_target=False, positions=None),
13101318
Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=362, starts_line=None, is_jump_target=False, positions=None),

0 commit comments

Comments
 (0)