diff -r fb965ee44d5e Lib/dis.py --- a/Lib/dis.py Sat May 28 14:48:19 2016 +0300 +++ b/Lib/dis.py Sat May 28 18:45:39 2016 +0300 @@ -304,7 +304,10 @@ def _get_instructions_bytes(code, varnam elif op in hasname: argval, argrepr = _get_name_info(arg, names) elif op in hasjrel: - argval = offset + 2 + arg + argval = offset + 2 + arg * 2 + argrepr = "to " + repr(argval) + elif op in hasjabs: + argval = arg * 2 argrepr = "to " + repr(argval) elif op in haslocal: argval, argrepr = _get_name_info(arg, varnames) @@ -371,9 +374,9 @@ def findlabels(code): for offset, op, arg in _unpack_opargs(code): if arg is not None: if op in hasjrel: - label = offset + 2 + arg + label = offset + 2 + arg * 2 elif op in hasjabs: - label = arg + label = arg * 2 else: continue if label not in labels: diff -r fb965ee44d5e Lib/importlib/_bootstrap_external.py --- a/Lib/importlib/_bootstrap_external.py Sat May 28 14:48:19 2016 +0300 +++ b/Lib/importlib/_bootstrap_external.py Sat May 28 18:45:39 2016 +0300 @@ -226,6 +226,7 @@ def _write_atomic(path, data, mode=0o666 # Python 3.6a0 3360 (add FORMAT_VALUE opcode #25483 # Python 3.6a0 3361 (lineno delta of code.co_lnotab becomes signed) # Python 3.6a0 3370 (16 bit wordcode) +# Python 3.6a0 3371 (jump offsets in 16-bit units) # # MAGIC must change whenever the bytecode emitted by the compiler may no # longer be understood by older implementations of the eval loop (usually @@ -234,7 +235,7 @@ def _write_atomic(path, data, mode=0o666 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array # in PC/launcher.c must also be updated. -MAGIC_NUMBER = (3370).to_bytes(2, 'little') + b'\r\n' +MAGIC_NUMBER = (3371).to_bytes(2, 'little') + b'\r\n' _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c _PYCACHE = '__pycache__' diff -r fb965ee44d5e Lib/test/test_dis.py --- a/Lib/test/test_dis.py Sat May 28 14:48:19 2016 +0300 +++ b/Lib/test/test_dis.py Sat May 28 18:45:39 2016 +0300 @@ -121,17 +121,17 @@ def bug708901(): pass dis_bug708901 = """\ -%3d 0 SETUP_LOOP 18 (to 20) +%3d 0 SETUP_LOOP 9 (to 20) 2 LOAD_GLOBAL 0 (range) 4 LOAD_CONST 1 (1) %3d 6 LOAD_CONST 2 (10) 8 CALL_FUNCTION 2 (2 positional, 0 keyword pair) 10 GET_ITER - >> 12 FOR_ITER 4 (to 18) + >> 12 FOR_ITER 2 (to 18) 14 STORE_FAST 0 (res) -%3d 16 JUMP_ABSOLUTE 12 +%3d 16 JUMP_ABSOLUTE 6 (to 12) >> 18 POP_BLOCK >> 20 LOAD_CONST 0 (None) 22 RETURN_VALUE @@ -147,7 +147,7 @@ def bug1333982(x=[]): dis_bug1333982 = """\ %3d 0 LOAD_CONST 1 (0) - 2 POP_JUMP_IF_TRUE 26 + 2 POP_JUMP_IF_TRUE 13 (to 26) 4 LOAD_GLOBAL 0 (AssertionError) 6 LOAD_CONST 2 ( at 0x..., file "%s", line %d>) 8 LOAD_CONST 3 ('bug1333982..') @@ -217,36 +217,36 @@ dis_compound_stmt_str = """\ 1 0 LOAD_CONST 0 (0) 2 STORE_NAME 0 (x) - 2 4 SETUP_LOOP 12 (to 18) + 2 4 SETUP_LOOP 6 (to 18) 3 >> 6 LOAD_NAME 0 (x) 8 LOAD_CONST 1 (1) 10 INPLACE_ADD 12 STORE_NAME 0 (x) - 14 JUMP_ABSOLUTE 6 + 14 JUMP_ABSOLUTE 3 (to 6) 16 POP_BLOCK >> 18 LOAD_CONST 2 (None) 20 RETURN_VALUE """ dis_traceback = """\ -%3d 0 SETUP_EXCEPT 12 (to 14) +%3d 0 SETUP_EXCEPT 6 (to 14) %3d 2 LOAD_CONST 1 (1) 4 LOAD_CONST 2 (0) --> 6 BINARY_TRUE_DIVIDE 8 POP_TOP 10 POP_BLOCK - 12 JUMP_FORWARD 40 (to 54) + 12 JUMP_FORWARD 20 (to 54) %3d >> 14 DUP_TOP 16 LOAD_GLOBAL 0 (Exception) 18 COMPARE_OP 10 (exception match) - 20 POP_JUMP_IF_FALSE 52 + 20 POP_JUMP_IF_FALSE 26 (to 52) 22 POP_TOP 24 STORE_FAST 0 (e) 26 POP_TOP - 28 SETUP_FINALLY 12 (to 42) + 28 SETUP_FINALLY 6 (to 42) %3d 30 LOAD_FAST 0 (e) 32 LOAD_ATTR 1 (__traceback__) @@ -258,7 +258,7 @@ dis_traceback = """\ 44 STORE_FAST 0 (e) 46 DELETE_FAST 0 (e) 48 END_FINALLY - 50 JUMP_FORWARD 2 (to 54) + 50 JUMP_FORWARD 1 (to 54) >> 52 END_FINALLY %3d >> 54 LOAD_FAST 1 (tb) @@ -710,12 +710,12 @@ expected_opinfo_inner = [ ] expected_opinfo_jumpy = [ - Instruction(opname='SETUP_LOOP', opcode=120, arg=52, argval=54, argrepr='to 54', offset=0, starts_line=3, is_jump_target=False), + Instruction(opname='SETUP_LOOP', opcode=120, arg=26, argval=54, argrepr='to 54', offset=0, starts_line=3, is_jump_target=False), Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='range', argrepr='range', offset=2, starts_line=None, is_jump_target=False), Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=10, argrepr='10', offset=4, starts_line=None, is_jump_target=False), Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=6, starts_line=None, is_jump_target=False), Instruction(opname='GET_ITER', opcode=68, arg=None, argval=None, argrepr='', offset=8, starts_line=None, is_jump_target=False), - Instruction(opname='FOR_ITER', opcode=93, arg=32, argval=44, argrepr='to 44', offset=10, starts_line=None, is_jump_target=True), + Instruction(opname='FOR_ITER', opcode=93, arg=16, argval=44, argrepr='to 44', offset=10, starts_line=None, is_jump_target=True), Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=12, starts_line=None, is_jump_target=False), Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=14, starts_line=4, is_jump_target=False), Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=16, starts_line=None, is_jump_target=False), @@ -724,22 +724,22 @@ expected_opinfo_jumpy = [ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=22, starts_line=5, is_jump_target=False), Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=24, starts_line=None, is_jump_target=False), Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=26, starts_line=None, is_jump_target=False), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=32, argval=32, argrepr='', offset=28, starts_line=None, is_jump_target=False), - Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=10, argval=10, argrepr='', offset=30, starts_line=6, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=16, argval=32, argrepr='to 32', offset=28, starts_line=None, is_jump_target=False), + Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=5, argval=10, argrepr='to 10', offset=30, starts_line=6, is_jump_target=False), Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=32, starts_line=7, is_jump_target=True), Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=34, starts_line=None, is_jump_target=False), Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=36, starts_line=None, is_jump_target=False), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=10, argval=10, argrepr='', offset=38, starts_line=None, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=5, argval=10, argrepr='to 10', offset=38, starts_line=None, is_jump_target=False), Instruction(opname='BREAK_LOOP', opcode=80, arg=None, argval=None, argrepr='', offset=40, starts_line=8, is_jump_target=False), - Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=10, argval=10, argrepr='', offset=42, starts_line=None, is_jump_target=False), + Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=5, argval=10, argrepr='to 10', offset=42, starts_line=None, is_jump_target=False), Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=44, starts_line=None, is_jump_target=True), Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=46, starts_line=10, is_jump_target=False), Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=48, starts_line=None, is_jump_target=False), Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=50, starts_line=None, is_jump_target=False), Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=52, starts_line=None, is_jump_target=False), - Instruction(opname='SETUP_LOOP', opcode=120, arg=52, argval=108, argrepr='to 108', offset=54, starts_line=11, is_jump_target=True), + Instruction(opname='SETUP_LOOP', opcode=120, arg=26, argval=108, argrepr='to 108', offset=54, starts_line=11, is_jump_target=True), Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=56, starts_line=None, is_jump_target=True), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=98, argval=98, argrepr='', offset=58, starts_line=None, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=49, argval=98, argrepr='to 98', offset=58, starts_line=None, is_jump_target=False), Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=60, starts_line=12, is_jump_target=False), Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=62, starts_line=None, is_jump_target=False), Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=64, starts_line=None, is_jump_target=False), @@ -751,31 +751,31 @@ expected_opinfo_jumpy = [ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=76, starts_line=14, is_jump_target=False), Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=78, starts_line=None, is_jump_target=False), Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=80, starts_line=None, is_jump_target=False), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=86, argval=86, argrepr='', offset=82, starts_line=None, is_jump_target=False), - Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=56, argval=56, argrepr='', offset=84, starts_line=15, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=43, argval=86, argrepr='to 86', offset=82, starts_line=None, is_jump_target=False), + Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=28, argval=56, argrepr='to 56', offset=84, starts_line=15, is_jump_target=False), Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=86, starts_line=16, is_jump_target=True), Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=88, starts_line=None, is_jump_target=False), Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=90, starts_line=None, is_jump_target=False), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=56, argval=56, argrepr='', offset=92, starts_line=None, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=28, argval=56, argrepr='to 56', offset=92, starts_line=None, is_jump_target=False), Instruction(opname='BREAK_LOOP', opcode=80, arg=None, argval=None, argrepr='', offset=94, starts_line=17, is_jump_target=False), - Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=56, argval=56, argrepr='', offset=96, starts_line=None, is_jump_target=False), + Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=28, argval=56, argrepr='to 56', offset=96, starts_line=None, is_jump_target=False), Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=98, starts_line=None, is_jump_target=True), Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=100, starts_line=19, is_jump_target=False), 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=102, starts_line=None, is_jump_target=False), Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=104, starts_line=None, is_jump_target=False), Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=106, starts_line=None, is_jump_target=False), - Instruction(opname='SETUP_FINALLY', opcode=122, arg=70, argval=180, argrepr='to 180', offset=108, starts_line=20, is_jump_target=True), - Instruction(opname='SETUP_EXCEPT', opcode=121, arg=12, argval=124, argrepr='to 124', offset=110, starts_line=None, is_jump_target=False), + Instruction(opname='SETUP_FINALLY', opcode=122, arg=35, argval=180, argrepr='to 180', offset=108, starts_line=20, is_jump_target=True), + Instruction(opname='SETUP_EXCEPT', opcode=121, arg=6, argval=124, argrepr='to 124', offset=110, starts_line=None, is_jump_target=False), Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=112, starts_line=21, is_jump_target=False), Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=114, starts_line=None, is_jump_target=False), Instruction(opname='BINARY_TRUE_DIVIDE', opcode=27, arg=None, argval=None, argrepr='', offset=116, starts_line=None, is_jump_target=False), Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=118, starts_line=None, is_jump_target=False), Instruction(opname='POP_BLOCK', opcode=87, arg=None, argval=None, argrepr='', offset=120, starts_line=None, is_jump_target=False), - Instruction(opname='JUMP_FORWARD', opcode=110, arg=28, argval=152, argrepr='to 152', offset=122, starts_line=None, is_jump_target=False), + Instruction(opname='JUMP_FORWARD', opcode=110, arg=14, argval=152, argrepr='to 152', offset=122, starts_line=None, is_jump_target=False), Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=124, starts_line=22, is_jump_target=True), Instruction(opname='LOAD_GLOBAL', opcode=116, arg=2, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=126, starts_line=None, is_jump_target=False), Instruction(opname='COMPARE_OP', opcode=107, arg=10, argval='exception match', argrepr='exception match', offset=128, starts_line=None, is_jump_target=False), - Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=150, argval=150, argrepr='', offset=130, starts_line=None, is_jump_target=False), + Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=75, argval=150, argrepr='to 150', offset=130, starts_line=None, is_jump_target=False), Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=132, starts_line=None, is_jump_target=False), Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=134, starts_line=None, is_jump_target=False), Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=136, starts_line=None, is_jump_target=False), @@ -784,10 +784,10 @@ expected_opinfo_jumpy = [ Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='1 positional, 0 keyword pair', offset=142, starts_line=None, is_jump_target=False), Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=144, starts_line=None, is_jump_target=False), Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=146, starts_line=None, is_jump_target=False), - Instruction(opname='JUMP_FORWARD', opcode=110, arg=26, argval=176, argrepr='to 176', offset=148, starts_line=None, is_jump_target=False), + Instruction(opname='JUMP_FORWARD', opcode=110, arg=13, argval=176, argrepr='to 176', offset=148, starts_line=None, is_jump_target=False), Instruction(opname='END_FINALLY', opcode=88, arg=None, argval=None, argrepr='', offset=150, starts_line=None, is_jump_target=True), Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=152, starts_line=25, is_jump_target=True), - Instruction(opname='SETUP_WITH', opcode=143, arg=14, argval=170, argrepr='to 170', offset=154, starts_line=None, is_jump_target=False), + Instruction(opname='SETUP_WITH', opcode=143, arg=7, argval=170, argrepr='to 170', offset=154, starts_line=None, is_jump_target=False), Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=156, starts_line=None, is_jump_target=False), Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=158, starts_line=26, is_jump_target=False), Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Never reach this', argrepr="'Never reach this'", offset=160, starts_line=None, is_jump_target=False), diff -r fb965ee44d5e PC/launcher.c --- a/PC/launcher.c Sat May 28 14:48:19 2016 +0300 +++ b/PC/launcher.c Sat May 28 18:45:39 2016 +0300 @@ -1089,7 +1089,7 @@ static PYC_MAGIC magic_values[] = { { 3190, 3230, L"3.3" }, { 3250, 3310, L"3.4" }, { 3320, 3350, L"3.5" }, - { 3360, 3370, L"3.6" }, + { 3360, 3371, L"3.6" }, { 0 } }; diff -r fb965ee44d5e Python/ceval.c --- a/Python/ceval.c Sat May 28 14:48:19 2016 +0300 +++ b/Python/ceval.c Sat May 28 18:45:39 2016 +0300 @@ -902,7 +902,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int #define FAST_DISPATCH() \ { \ if (!lltrace && !_Py_TracingPossible) { \ - f->f_lasti = INSTR_OFFSET(); \ + f->f_lasti = INSTR_OFFSET() * 2; \ NEXTOPARG(); \ goto *opcode_targets[opcode]; \ } \ @@ -912,7 +912,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int #define FAST_DISPATCH() \ { \ if (!_Py_TracingPossible) { \ - f->f_lasti = INSTR_OFFSET(); \ + f->f_lasti = INSTR_OFFSET() * 2; \ NEXTOPARG(); \ goto *opcode_targets[opcode]; \ } \ @@ -987,15 +987,15 @@ PyEval_EvalFrameEx(PyFrameObject *f, int #define OPARG(word) ((word) >> 8) #endif /* The integer overflow is checked by an assertion below. */ -#define INSTR_OFFSET() (2*(int)(next_instr - first_instr)) +#define INSTR_OFFSET() ((int)(next_instr - first_instr)) #define NEXTOPARG() do { \ unsigned short word = *next_instr; \ opcode = OPCODE(word); \ oparg = OPARG(word); \ next_instr++; \ } while (0) -#define JUMPTO(x) (next_instr = first_instr + (x)/2) -#define JUMPBY(x) (next_instr += (x)/2) +#define JUMPTO(x) (next_instr = first_instr + (x)) +#define JUMPBY(x) (next_instr += (x)) /* OpCode prediction macros Some opcodes tend to come in pairs thus making it possible to @@ -1190,7 +1190,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int next_instr = first_instr; if (f->f_lasti >= 0) { assert(f->f_lasti % 2 == 0); - next_instr += f->f_lasti/2 + 1; + next_instr += f->f_lasti / 2 + 1; } stack_pointer = f->f_stacktop; assert(stack_pointer != NULL); @@ -1300,7 +1300,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int } fast_next_opcode: - f->f_lasti = INSTR_OFFSET(); + f->f_lasti = INSTR_OFFSET() * 2; /* line-by-line tracing support */ @@ -1316,7 +1316,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int tstate, f, &instr_lb, &instr_ub, &instr_prev); /* Reload possibly changed frame fields */ - JUMPTO(f->f_lasti); + JUMPTO(f->f_lasti / 2); if (f->f_stacktop != NULL) { stack_pointer = f->f_stacktop; f->f_stacktop = NULL; diff -r fb965ee44d5e Python/compile.c --- a/Python/compile.c Sat May 28 14:48:19 2016 +0300 +++ b/Python/compile.c Sat May 28 18:45:39 2016 +0300 @@ -4574,9 +4574,9 @@ assemble_jump_offsets(struct assembler * */ bsize += isize; if (instr->i_jabs || instr->i_jrel) { - instr->i_oparg = instr->i_target->b_offset; + instr->i_oparg = instr->i_target->b_offset / 2; if (instr->i_jrel) { - instr->i_oparg -= bsize; + instr->i_oparg -= bsize / 2; } if (instrsize(instr->i_oparg) != isize) { extended_arg_recompile = 1; diff -r fb965ee44d5e Python/peephole.c --- a/Python/peephole.c Sat May 28 14:48:19 2016 +0300 +++ b/Python/peephole.c Sat May 28 18:45:39 2016 +0300 @@ -17,7 +17,8 @@ || op==POP_JUMP_IF_FALSE || op==POP_JUMP_IF_TRUE \ || op==JUMP_IF_FALSE_OR_POP || op==JUMP_IF_TRUE_OR_POP) #define JUMPS_ON_TRUE(op) (op==POP_JUMP_IF_TRUE || op==JUMP_IF_TRUE_OR_POP) -#define GETJUMPTGT(arr, i) (get_arg(arr, i) + (ABSOLUTE_JUMP(arr[i]) ? 0 : i+2)) +#define GETJUMPTGT(arr, i) (get_arg(arr, i) * 2 + \ + (ABSOLUTE_JUMP(arr[i]) ? 0 : i + 2)) #define ISBASICBLOCK(blocks, start, end) \ (blocks[start]==blocks[end]) @@ -633,7 +634,7 @@ PyCode_Optimize(PyObject *code, PyObject */ case JUMP_IF_FALSE_OR_POP: case JUMP_IF_TRUE_OR_POP: - h = get_arg(codestr, i); + h = get_arg(codestr, i) * 2; tgt = find_op(codestr, h); j = codestr[tgt]; @@ -654,7 +655,7 @@ PyCode_Optimize(PyObject *code, PyObject they're not taken (so change the first jump to pop its argument when it's taken). */ - h = set_arg(codestr, i, tgt + 2); + h = set_arg(codestr, i, (tgt + 2) / 2); j = opcode == JUMP_IF_TRUE_OR_POP ? POP_JUMP_IF_TRUE : POP_JUMP_IF_FALSE; } @@ -697,7 +698,7 @@ PyCode_Optimize(PyObject *code, PyObject } j -= i + 2; /* Calc relative jump addr */ } - copy_op_arg(codestr, op_start, opcode, j, i+2); + copy_op_arg(codestr, op_start, opcode, j / 2, i + 2); } break; @@ -753,7 +754,7 @@ PyCode_Optimize(PyObject *code, PyObject case POP_JUMP_IF_TRUE: case JUMP_IF_FALSE_OR_POP: case JUMP_IF_TRUE_OR_POP: - j = blocks[j]; + j = blocks[j * 2] / 2; break; case FOR_ITER: @@ -763,7 +764,7 @@ PyCode_Optimize(PyObject *code, PyObject case SETUP_FINALLY: case SETUP_WITH: case SETUP_ASYNC_WITH: - j = blocks[j + i + 2] - blocks[i] - 2; + j = (blocks[j * 2 + i + 2] - blocks[i] - 2) / 2; break; } nexti = i - op_start + 2;