(original) (raw)

changeset: 94656:1eee26b74e4b user: Serhiy Storchaka storchaka@gmail.com date: Mon Feb 16 21:13:24 2015 +0200 files: Python/peephole.c description: Issue #23450: Silenced compiler warnings and added asserts in peephole optimizer. diff -r c0e79e080307 -r 1eee26b74e4b Python/peephole.c --- a/Python/peephole.c Mon Feb 16 20:54:23 2015 +0200 +++ b/Python/peephole.c Mon Feb 16 21:13:24 2015 +0200 @@ -18,7 +18,11 @@ || 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) (GETARG(arr,i) + (ABSOLUTE_JUMP(arr[i]) ? 0 : i+3)) -#define SETARG(arr, i, val) arr[i+2] = val>>8; arr[i+1] = val & 255 +#define SETARG(arr, i, val) do { \ + assert(0 <= val && val <= 0xffff); \ + arr[i+2] = (unsigned char)(((unsigned int)val)>>8); \ + arr[i+1] = (unsigned char)(((unsigned int)val) & 255); \ +} while(0) #define CODESIZE(op) (HAS_ARG(op) ? 3 : 1) #define ISBASICBLOCK(blocks, start, bytes) \ (blocks[start]==blocks[start+bytes-1]) @@ -355,7 +359,8 @@ unsigned char *codestr = NULL; unsigned char *lineno; int *addrmap = NULL; - int new_line, cum_orig_line, last_line, tabsiz; + int new_line, cum_orig_line, last_line; + Py_ssize_t tabsiz; PyObject **const_stack = NULL; Py_ssize_t *load_const_stack = NULL; Py_ssize_t const_stack_top = -1; @@ -660,7 +665,8 @@ /* Fixup linenotab */ for (i=0, nops=0 ; i/storchaka@gmail.com