Mailman 3 April 2022 - Python-checkins

bpo-47168: Mark files generated by `make regen-limited-abi` as generated (GH-32195)
by encukou April 1, 2022

April 1, 2022

https://github.com/python/cpython/commit/079143df7e40c4d336cb5c385b166aa910… commit: 079143df7e40c4d336cb5c385b166aa91058d050 branch: main author: Petr Viktorin <encukou(a)gmail.com> committer: encukou <encukou(a)gmail.com> date: 2022-04-01T17:19:05+02:00 summary: bpo-47168: Mark files generated by `make regen-limited-abi` as generated (GH-32195) files: M .gitattributes diff --git a/.gitattributes b/.gitattributes index 2718e63e5748f..bc513e437e018 100644 --- a/.gitattributes +++ b/.gitattributes @@ -60,14 +60,17 @@ PC/readme.txt text eol=crlf **/clinic/*.c.h generated *_db.h generated +Doc/data/stable_abi.dat generated Doc/library/token-list.inc generated Include/internal/pycore_ast.h generated Include/internal/pycore_ast_state.h generated Include/opcode.h generated Include/token.h generated Lib/keyword.py generated +Lib/test/test_stable_abi_ctypes.py generated Lib/token.py generated Objects/typeslots.inc generated +PC/python3dll.c generated Parser/parser.c generated Parser/token.c generated Programs/test_frozenmain.h generated

1 0

bpo-47172: Compiler enhancements (GH-32200)
by markshannon April 1, 2022

April 1, 2022

https://github.com/python/cpython/commit/997ba5d126f5040d5b7536f73bc89049e9… commit: 997ba5d126f5040d5b7536f73bc89049e9f9421d branch: main author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: markshannon <mark(a)hotpy.org> date: 2022-04-01T15:50:15+01:00 summary: bpo-47172: Compiler enhancements (GH-32200) * Make virtual opcodes negative. * Make is_jump detect only actual jumps. * Use is_block_push for the exception block setup opcodes. files: M Python/compile.c diff --git a/Python/compile.c b/Python/compile.c index bdf886bf42352..c3773a4f48929 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -72,18 +72,26 @@ /* Pseudo-instructions used in the compiler, * but turned into NOPs by the assembler. */ -#define SETUP_FINALLY 255 -#define SETUP_CLEANUP 254 -#define SETUP_WITH 253 -#define POP_BLOCK 252 -#define JUMP 251 +#define SETUP_FINALLY -1 +#define SETUP_CLEANUP -2 +#define SETUP_WITH -3 +#define POP_BLOCK -4 +#define JUMP -5 + +#define MIN_VIRTUAL_OPCODE -5 +#define MAX_ALLOWED_OPCODE 254 + +#define IS_WITHIN_OPCODE_RANGE(opcode) \ + ((opcode) >= MIN_VIRTUAL_OPCODE && (opcode) <= MAX_ALLOWED_OPCODE) + +#define IS_VIRTUAL_OPCODE(opcode) ((opcode) < 0) #define IS_TOP_LEVEL_AWAIT(c) ( \ (c->c_flags->cf_flags & PyCF_ALLOW_TOP_LEVEL_AWAIT) \ && (c->u->u_ste->ste_type == ModuleBlock)) struct instr { - unsigned char i_opcode; + int i_opcode; int i_oparg; /* target block (if jump instruction) */ struct basicblock_ *i_target; @@ -115,8 +123,13 @@ is_bit_set_in_table(const uint32_t *table, int bitindex) { * Word is indexed by (bitindex>>ln(size of int in bits)). * Bit within word is the low bits of bitindex. */ - uint32_t word = table[bitindex >> LOG_BITS_PER_INT]; - return (word >> (bitindex & MASK_LOW_LOG_BITS)) & 1; + if (bitindex >= 0 && bitindex < 256) { + uint32_t word = table[bitindex >> LOG_BITS_PER_INT]; + return (word >> (bitindex & MASK_LOW_LOG_BITS)) & 1; + } + else { + return 0; + } } static inline int @@ -125,11 +138,17 @@ is_relative_jump(struct instr *i) return is_bit_set_in_table(_PyOpcode_RelativeJump, i->i_opcode); } +static inline int +is_block_push(struct instr *instr) +{ + int opcode = instr->i_opcode; + return opcode == SETUP_FINALLY || opcode == SETUP_WITH || opcode == SETUP_CLEANUP; +} + static inline int is_jump(struct instr *i) { - return i->i_opcode >= SETUP_WITH || - i->i_opcode == JUMP || + return i->i_opcode == JUMP || is_bit_set_in_table(_PyOpcode_Jump, i->i_opcode); } @@ -137,6 +156,7 @@ static int instr_size(struct instr *instruction) { int opcode = instruction->i_opcode; + assert(!IS_VIRTUAL_OPCODE(opcode)); int oparg = HAS_ARG(opcode) ? instruction->i_oparg : 0; int extended_args = (0xFFFFFF < oparg) + (0xFFFF < oparg) + (0xFF < oparg); int caches = _PyOpcode_Caches[opcode]; @@ -147,6 +167,7 @@ static void write_instr(_Py_CODEUNIT *codestr, struct instr *instruction, int ilen) { int opcode = instruction->i_opcode; + assert(!IS_VIRTUAL_OPCODE(opcode)); int oparg = HAS_ARG(opcode) ? instruction->i_oparg : 0; int caches = _PyOpcode_Caches[opcode]; switch (ilen - caches) { @@ -1177,6 +1198,7 @@ static int compiler_addop_line(struct compiler *c, int opcode, int line, int end_line, int col_offset, int end_col_offset) { + assert(IS_WITHIN_OPCODE_RANGE(opcode)); assert(!HAS_ARG(opcode) || IS_ARTIFICIAL(opcode)); if (compiler_use_new_implicit_block_if_needed(c) < 0) { @@ -1419,6 +1441,7 @@ compiler_addop_i_line(struct compiler *c, int opcode, Py_ssize_t oparg, The argument of a concrete bytecode instruction is limited to 8-bit. EXTENDED_ARG is used for 16, 24, and 32-bit arguments. */ + assert(IS_WITHIN_OPCODE_RANGE(opcode)); assert(HAS_ARG(opcode)); assert(0 <= oparg && oparg <= 2147483647); @@ -1462,7 +1485,8 @@ static int add_jump_to_block(struct compiler *c, int opcode, int col_offset, int end_col_offset, basicblock *target) { - assert(HAS_ARG(opcode)); + assert(IS_WITHIN_OPCODE_RANGE(opcode)); + assert(HAS_ARG(opcode) || IS_VIRTUAL_OPCODE(opcode)); assert(target != NULL); if (compiler_use_new_implicit_block_if_needed(c) < 0) { @@ -7040,7 +7064,7 @@ stackdepth(struct compiler *c) maxdepth = new_depth; } assert(depth >= 0); /* invalid code or bug in stackdepth() */ - if (is_jump(instr)) { + if (is_jump(instr) || is_block_push(instr)) { effect = stack_effect(instr->i_opcode, instr->i_oparg, 1); assert(effect != PY_INVALID_STACK_EFFECT); int target_depth = depth + effect; @@ -7159,13 +7183,6 @@ assemble_emit_table_pair(struct assembler* a, PyObject** table, int* offset, return 1; } -static int -is_block_push(struct instr *instr) -{ - int opcode = instr->i_opcode; - return opcode == SETUP_FINALLY || opcode == SETUP_WITH || opcode == SETUP_CLEANUP; -} - static basicblock * push_except_block(ExceptStack *stack, struct instr *setup) { assert(is_block_push(setup)); @@ -8600,6 +8617,7 @@ apply_static_swaps(basicblock *block, int i) static bool jump_thread(struct instr *inst, struct instr *target, int opcode) { + assert(!IS_VIRTUAL_OPCODE(opcode) || opcode == JUMP); assert(is_jump(inst)); assert(is_jump(target)); // bpo-45773: If inst->i_target == target->i_target, then nothing actually @@ -8629,7 +8647,7 @@ optimize_basic_block(struct compiler *c, basicblock *bb, PyObject *consts) struct instr *inst = &bb->b_instr[i]; int oparg = inst->i_oparg; int nextop = i+1 < bb->b_iused ? bb->b_instr[i+1].i_opcode : 0; - if (is_jump(inst)) { + if (is_jump(inst) || is_block_push(inst)) { /* Skip over empty basic blocks. */ while (inst->i_target->b_iused == 0) { inst->i_target = inst->i_target->b_next; @@ -8996,8 +9014,9 @@ mark_reachable(struct assembler *a) { } for (int i = 0; i < b->b_iused; i++) { basicblock *target; - if (is_jump(&b->b_instr[i])) { - target = b->b_instr[i].i_target; + struct instr *instr = &b->b_instr[i]; + if (is_jump(instr) || is_block_push(instr)) { + target = instr->i_target; if (target->b_predecessors == 0) { *sp++ = target; } @@ -9073,13 +9092,6 @@ propagate_line_numbers(struct assembler *a) { } } if (is_jump(&b->b_instr[b->b_iused-1])) { - switch (b->b_instr[b->b_iused-1].i_opcode) { - /* Note: Only actual jumps, not exception handlers */ - case SETUP_WITH: - case SETUP_FINALLY: - case SETUP_CLEANUP: - continue; - } basicblock *target = b->b_instr[b->b_iused-1].i_target; if (target->b_predecessors == 1) { if (target->b_instr[0].i_lineno < 0) { @@ -9205,13 +9217,6 @@ duplicate_exits_without_lineno(struct compiler *c) */ for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) { if (b->b_iused > 0 && is_jump(&b->b_instr[b->b_iused-1])) { - switch (b->b_instr[b->b_iused-1].i_opcode) { - /* Note: Only actual jumps, not exception handlers */ - case SETUP_WITH: - case SETUP_FINALLY: - case SETUP_CLEANUP: - continue; - } basicblock *target = b->b_instr[b->b_iused-1].i_target; if (is_exit_without_lineno(target) && target->b_predecessors > 1) { basicblock *new_target = compiler_copy_block(c, target);

1 0

bpo-47186: Replace JUMP_IF_NOT_EXC_MATCH by CHECK_EXC_MATCH + jump (GH-32231)
by markshannon April 1, 2022

April 1, 2022

https://github.com/python/cpython/commit/04e07c258f4f2ac85e25355242a113f98a… commit: 04e07c258f4f2ac85e25355242a113f98a706f04 branch: main author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: markshannon <mark(a)hotpy.org> date: 2022-04-01T13:59:38+01:00 summary: bpo-47186: Replace JUMP_IF_NOT_EXC_MATCH by CHECK_EXC_MATCH + jump (GH-32231) files: A Misc/NEWS.d/next/Core and Builtins/2022-04-01-11-53-59.bpo-47186.RBCPk8.rst M Doc/library/dis.rst M Doc/whatsnew/3.11.rst M Include/opcode.h M Lib/importlib/_bootstrap_external.py M Lib/opcode.py M Lib/test/test_dis.py M Objects/frameobject.c M Python/ceval.c M Python/compile.c M Python/opcode_targets.h diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst index d1a0cecd82841..b364e3f031b3d 100644 --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -628,6 +628,12 @@ iterations of the loop. .. versionadded:: 3.11 +.. opcode:: CHECK_EXC_MATCH + + Performs exception matching for ``except``. Tests whether the TOS1 is an exception + matching TOS. Pops TOS and pushes the boolean result of the test. + + .. versionadded:: 3.11 .. opcode:: WITH_EXCEPT_START @@ -916,18 +922,6 @@ iterations of the loop. .. versionadded:: 3.1 -.. opcode:: JUMP_IF_NOT_EXC_MATCH (target) - - Performs exception matching for ``except``. - Tests whether the second value on the stack is an exception matching TOS, - and jumps if it is not. Pops one value from the stack. - - .. versionadded:: 3.9 - - .. versionchanged:: 3.11 - This opcode no longer pops the active exception. - - .. opcode:: JUMP_IF_NOT_EG_MATCH (target) Performs exception matching for ``except*``. Applies ``split(TOS)`` on diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst index 15808679f7fd5..dc2d4b0937c77 100644 --- a/Doc/whatsnew/3.11.rst +++ b/Doc/whatsnew/3.11.rst @@ -520,7 +520,8 @@ CPython bytecode changes * Add :opcode:`POP_JUMP_IF_NOT_NONE` and :opcode:`POP_JUMP_IF_NONE` opcodes to speed up conditional jumps. -* :opcode:`JUMP_IF_NOT_EXC_MATCH` no longer pops the active exception. +* Replaced :opcode:`JUMP_IF_NOT_EXC_MATCH` by :opcode:`CHECK_EXC_MATCH` which + performs the check but does not jump. * Replaced :opcode:`JUMP_ABSOLUTE` by the relative :opcode:`JUMP_BACKWARD`. diff --git a/Include/opcode.h b/Include/opcode.h index 3a7db438ede1f..c82d1fd1fae2b 100644 --- a/Include/opcode.h +++ b/Include/opcode.h @@ -21,6 +21,7 @@ extern "C" { #define MATCH_SEQUENCE 32 #define MATCH_KEYS 33 #define PUSH_EXC_INFO 35 +#define CHECK_EXC_MATCH 36 #define WITH_EXCEPT_START 49 #define GET_AITER 50 #define GET_ANEXT 51 @@ -74,7 +75,6 @@ extern "C" { #define CONTAINS_OP 118 #define RERAISE 119 #define COPY 120 -#define JUMP_IF_NOT_EXC_MATCH 121 #define BINARY_OP 122 #define SEND 123 #define LOAD_FAST 124 @@ -136,39 +136,39 @@ extern "C" { #define COMPARE_OP_INT_JUMP 28 #define COMPARE_OP_STR_JUMP 29 #define JUMP_BACKWARD_QUICK 34 -#define LOAD_ATTR_ADAPTIVE 36 -#define LOAD_ATTR_INSTANCE_VALUE 37 -#define LOAD_ATTR_MODULE 38 -#define LOAD_ATTR_SLOT 39 -#define LOAD_ATTR_WITH_HINT 40 -#define LOAD_CONST__LOAD_FAST 41 -#define LOAD_FAST__LOAD_CONST 42 -#define LOAD_FAST__LOAD_FAST 43 -#define LOAD_GLOBAL_ADAPTIVE 44 -#define LOAD_GLOBAL_BUILTIN 45 -#define LOAD_GLOBAL_MODULE 46 -#define LOAD_METHOD_ADAPTIVE 47 -#define LOAD_METHOD_CLASS 48 -#define LOAD_METHOD_MODULE 55 -#define LOAD_METHOD_NO_DICT 56 -#define LOAD_METHOD_WITH_DICT 57 -#define LOAD_METHOD_WITH_VALUES 58 -#define PRECALL_ADAPTIVE 59 -#define PRECALL_BOUND_METHOD 62 -#define PRECALL_BUILTIN_CLASS 63 -#define PRECALL_BUILTIN_FAST_WITH_KEYWORDS 64 -#define PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 65 -#define PRECALL_NO_KW_BUILTIN_FAST 66 -#define PRECALL_NO_KW_BUILTIN_O 67 -#define PRECALL_NO_KW_ISINSTANCE 72 -#define PRECALL_NO_KW_LEN 73 -#define PRECALL_NO_KW_LIST_APPEND 76 -#define PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST 77 -#define PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS 78 -#define PRECALL_NO_KW_METHOD_DESCRIPTOR_O 79 -#define PRECALL_NO_KW_STR_1 80 -#define PRECALL_NO_KW_TUPLE_1 81 -#define PRECALL_NO_KW_TYPE_1 113 +#define LOAD_ATTR_ADAPTIVE 37 +#define LOAD_ATTR_INSTANCE_VALUE 38 +#define LOAD_ATTR_MODULE 39 +#define LOAD_ATTR_SLOT 40 +#define LOAD_ATTR_WITH_HINT 41 +#define LOAD_CONST__LOAD_FAST 42 +#define LOAD_FAST__LOAD_CONST 43 +#define LOAD_FAST__LOAD_FAST 44 +#define LOAD_GLOBAL_ADAPTIVE 45 +#define LOAD_GLOBAL_BUILTIN 46 +#define LOAD_GLOBAL_MODULE 47 +#define LOAD_METHOD_ADAPTIVE 48 +#define LOAD_METHOD_CLASS 55 +#define LOAD_METHOD_MODULE 56 +#define LOAD_METHOD_NO_DICT 57 +#define LOAD_METHOD_WITH_DICT 58 +#define LOAD_METHOD_WITH_VALUES 59 +#define PRECALL_ADAPTIVE 62 +#define PRECALL_BOUND_METHOD 63 +#define PRECALL_BUILTIN_CLASS 64 +#define PRECALL_BUILTIN_FAST_WITH_KEYWORDS 65 +#define PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 66 +#define PRECALL_NO_KW_BUILTIN_FAST 67 +#define PRECALL_NO_KW_BUILTIN_O 72 +#define PRECALL_NO_KW_ISINSTANCE 73 +#define PRECALL_NO_KW_LEN 76 +#define PRECALL_NO_KW_LIST_APPEND 77 +#define PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST 78 +#define PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS 79 +#define PRECALL_NO_KW_METHOD_DESCRIPTOR_O 80 +#define PRECALL_NO_KW_STR_1 81 +#define PRECALL_NO_KW_TUPLE_1 113 +#define PRECALL_NO_KW_TYPE_1 121 #define PRECALL_PYFUNC 141 #define RESUME_QUICK 143 #define STORE_ATTR_ADAPTIVE 150 @@ -205,7 +205,7 @@ static const uint32_t _PyOpcode_Jump[8] = { 0U, 0U, 536870912U, - 2316156928U, + 2282602496U, 4163U, 0U, 0U, @@ -259,6 +259,7 @@ const uint8_t _PyOpcode_Deopt[256] = { [CALL_FUNCTION_EX] = CALL_FUNCTION_EX, [CALL_PY_EXACT_ARGS] = CALL, [CALL_PY_WITH_DEFAULTS] = CALL, + [CHECK_EXC_MATCH] = CHECK_EXC_MATCH, [COMPARE_OP] = COMPARE_OP, [COMPARE_OP_ADAPTIVE] = COMPARE_OP, [COMPARE_OP_FLOAT_JUMP] = COMPARE_OP, @@ -294,7 +295,6 @@ const uint8_t _PyOpcode_Deopt[256] = { [JUMP_FORWARD] = JUMP_FORWARD, [JUMP_IF_FALSE_OR_POP] = JUMP_IF_FALSE_OR_POP, [JUMP_IF_NOT_EG_MATCH] = JUMP_IF_NOT_EG_MATCH, - [JUMP_IF_NOT_EXC_MATCH] = JUMP_IF_NOT_EXC_MATCH, [JUMP_IF_TRUE_OR_POP] = JUMP_IF_TRUE_OR_POP, [JUMP_NO_INTERRUPT] = JUMP_NO_INTERRUPT, [KW_NAMES] = KW_NAMES, diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py index 744fefd5e21e7..39a348aecef6c 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -397,6 +397,7 @@ def _write_atomic(path, data, mode=0o666): # Python 3.11a6 3487 (Remove the adaptive "oparg counter" mechanism) # Python 3.11a6 3488 (LOAD_GLOBAL can push additional NULL) # Python 3.11a6 3489 (Add JUMP_BACKWARD, remove JUMP_ABSOLUTE) +# Python 3.11a6 3490 (remove JUMP_IF_NOT_EXC_MATCH, add CHECK_EXC_MATCH) # Python 3.12 will start with magic number 3500 @@ -411,7 +412,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 = (3489).to_bytes(2, 'little') + b'\r\n' +MAGIC_NUMBER = (3490).to_bytes(2, 'little') + b'\r\n' _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c _PYCACHE = '__pycache__' diff --git a/Lib/opcode.py b/Lib/opcode.py index 6bc64177ac8fc..e993a5c1ff16a 100644 --- a/Lib/opcode.py +++ b/Lib/opcode.py @@ -76,6 +76,7 @@ def jabs_op(name, op, entries=0): def_op('MATCH_KEYS', 33) def_op('PUSH_EXC_INFO', 35) +def_op('CHECK_EXC_MATCH', 36) def_op('WITH_EXCEPT_START', 49) def_op('GET_AITER', 50) @@ -138,7 +139,6 @@ def jabs_op(name, op, entries=0): def_op('CONTAINS_OP', 118) def_op('RERAISE', 119) def_op('COPY', 120) -jabs_op('JUMP_IF_NOT_EXC_MATCH', 121) def_op('BINARY_OP', 122, 1) jrel_op('SEND', 123) # Number of bytes to skip def_op('LOAD_FAST', 124) # Local variable number diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py index 99db8ba0ac3b9..544e1350cb7f9 100644 --- a/Lib/test/test_dis.py +++ b/Lib/test/test_dis.py @@ -372,7 +372,8 @@ def bug42562(): >> PUSH_EXC_INFO %3d LOAD_GLOBAL 0 (Exception) - JUMP_IF_NOT_EXC_MATCH 35 (to 70) + CHECK_EXC_MATCH + POP_JUMP_IF_FALSE 36 (to 72) STORE_FAST 0 (e) %3d LOAD_FAST 0 (e) @@ -683,8 +684,7 @@ def test_boundaries(self): def test_widths(self): for opcode, opname in enumerate(dis.opname): if opname in ('BUILD_MAP_UNPACK_WITH_CALL', - 'BUILD_TUPLE_UNPACK_WITH_CALL', - 'JUMP_IF_NOT_EXC_MATCH'): + 'BUILD_TUPLE_UNPACK_WITH_CALL'): continue with self.subTest(opname=opname): width = dis._OPNAME_WIDTH @@ -1299,47 +1299,48 @@ def _prepare_test_cases(): Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=322, starts_line=None, is_jump_target=False, positions=None), Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=324, starts_line=None, is_jump_target=False, positions=None), Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=326, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='JUMP_FORWARD', opcode=110, arg=30, argval=390, argrepr='to 390', offset=328, starts_line=None, is_jump_target=True, positions=None), + Instruction(opname='JUMP_FORWARD', opcode=110, arg=31, argval=392, argrepr='to 392', offset=328, starts_line=None, is_jump_target=True, positions=None), Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=330, starts_line=None, is_jump_target=False, positions=None), Instruction(opname='LOAD_GLOBAL', opcode=116, arg=4, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=332, starts_line=22, is_jump_target=False, positions=None), - Instruction(opname='JUMP_IF_NOT_EXC_MATCH', opcode=121, arg=191, argval=382, argrepr='to 382', offset=344, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=346, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=348, starts_line=23, is_jump_target=False, positions=None), - 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=360, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=362, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=366, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=376, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=378, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='JUMP_FORWARD', opcode=110, arg=21, argval=424, argrepr='to 424', offset=380, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=382, starts_line=22, is_jump_target=True, positions=None), - Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=384, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=386, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=388, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=390, starts_line=28, is_jump_target=True, positions=None), - Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=402, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=404, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=408, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=418, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=420, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=422, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=424, starts_line=23, is_jump_target=True, positions=None), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=426, starts_line=28, is_jump_target=False, positions=None), - Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=438, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=440, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=444, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=454, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=456, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=458, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=460, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=462, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=474, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=476, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=480, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=490, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=492, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=494, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=496, starts_line=None, is_jump_target=False, positions=None), - Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=498, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='CHECK_EXC_MATCH', opcode=36, arg=None, argval=None, argrepr='', offset=344, starts_line=None, is_jump_target=False, positions=None), + 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), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=348, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=350, starts_line=23, is_jump_target=False, positions=None), + 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), + Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=364, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=368, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=378, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=380, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='JUMP_FORWARD', opcode=110, arg=21, argval=426, argrepr='to 426', offset=382, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=384, starts_line=22, is_jump_target=True, positions=None), + Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=386, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=388, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=390, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=392, starts_line=28, is_jump_target=True, positions=None), + Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=404, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=406, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=410, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=420, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=422, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=424, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=426, starts_line=23, is_jump_target=True, positions=None), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=428, starts_line=28, is_jump_target=False, positions=None), + Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=440, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=442, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=446, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=456, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=458, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=460, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=462, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=464, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=476, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=478, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=482, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=492, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=494, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=496, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=498, starts_line=None, is_jump_target=False, positions=None), + Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=500, starts_line=None, is_jump_target=False, positions=None), ] # One last piece of inspect fodder to check the default line number handling diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-04-01-11-53-59.bpo-47186.RBCPk8.rst b/Misc/NEWS.d/next/Core and Builtins/2022-04-01-11-53-59.bpo-47186.RBCPk8.rst new file mode 100644 index 0000000000000..002da2ba3791a --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-04-01-11-53-59.bpo-47186.RBCPk8.rst @@ -0,0 +1 @@ +Replace :opcode:`JUMP_IF_NOT_EXC_MATCH` by :opcode:`CHECK_EXC_MATCH` + jump. diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 581de22587219..fe374bf0632cd 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -207,7 +207,6 @@ mark_stacks(PyCodeObject *code_obj, int len) case JUMP_IF_TRUE_OR_POP: case POP_JUMP_IF_FALSE: case POP_JUMP_IF_TRUE: - case JUMP_IF_NOT_EXC_MATCH: case JUMP_IF_NOT_EG_MATCH: { int64_t target_stack; @@ -216,8 +215,7 @@ mark_stacks(PyCodeObject *code_obj, int len) if (stacks[j] == UNINITIALIZED && j < i) { todo = 1; } - if (opcode == JUMP_IF_NOT_EXC_MATCH || - opcode == JUMP_IF_NOT_EG_MATCH) + if (opcode == JUMP_IF_NOT_EG_MATCH) { next_stack = pop_value(pop_value(next_stack)); target_stack = next_stack; diff --git a/Python/ceval.c b/Python/ceval.c index 8c1f21b086da9..43080f8db0422 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3853,7 +3853,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int DISPATCH(); } - TARGET(JUMP_IF_NOT_EXC_MATCH) { + TARGET(CHECK_EXC_MATCH) { PyObject *right = POP(); PyObject *left = TOP(); assert(PyExceptionInstance_Check(left)); @@ -3864,9 +3864,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int int res = PyErr_GivenExceptionMatches(left, right); Py_DECREF(right); - if (res == 0) { - JUMPTO(oparg); - } + PUSH(Py_NewRef(res ? Py_True : Py_False)); DISPATCH(); } diff --git a/Python/compile.c b/Python/compile.c index 7a073777ee1cf..bdf886bf42352 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -977,8 +977,8 @@ stack_effect(int opcode, int oparg, int jump) case IS_OP: case CONTAINS_OP: return -1; - case JUMP_IF_NOT_EXC_MATCH: - return -1; + case CHECK_EXC_MATCH: + return 0; case JUMP_IF_NOT_EG_MATCH: return jump > 0 ? -1 : 0; case IMPORT_NAME: @@ -3352,7 +3352,8 @@ compiler_try_star_finally(struct compiler *c, stmt_ty s) [] JUMP L0 [exc] L1: <evaluate E1> ) - [exc, E1] JUMP_IF_NOT_EXC_MATCH L2 ) only if E1 + [exc, E1] CHECK_EXC_MATCH ) + [exc, bool] POP_JUMP_IF_FALSE L2 ) only if E1 [exc] <assign to V1> (or POP if no V1) [] <code for S1> JUMP L0 @@ -3410,7 +3411,8 @@ compiler_try_except(struct compiler *c, stmt_ty s) return 0; if (handler->v.ExceptHandler.type) { VISIT(c, expr, handler->v.ExceptHandler.type); - ADDOP_JUMP(c, JUMP_IF_NOT_EXC_MATCH, except); + ADDOP(c, CHECK_EXC_MATCH); + ADDOP_JUMP(c, POP_JUMP_IF_FALSE, except); } if (handler->v.ExceptHandler.name) { basicblock *cleanup_end, *cleanup_body; diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h index 3afaf0b029831..2eba5531723fb 100644 --- a/Python/opcode_targets.h +++ b/Python/opcode_targets.h @@ -35,6 +35,7 @@ static void *opcode_targets[256] = { &&TARGET_MATCH_KEYS, &&TARGET_JUMP_BACKWARD_QUICK, &&TARGET_PUSH_EXC_INFO, + &&TARGET_CHECK_EXC_MATCH, &&TARGET_LOAD_ATTR_ADAPTIVE, &&TARGET_LOAD_ATTR_INSTANCE_VALUE, &&TARGET_LOAD_ATTR_MODULE, @@ -47,40 +48,39 @@ static void *opcode_targets[256] = { &&TARGET_LOAD_GLOBAL_BUILTIN, &&TARGET_LOAD_GLOBAL_MODULE, &&TARGET_LOAD_METHOD_ADAPTIVE, - &&TARGET_LOAD_METHOD_CLASS, &&TARGET_WITH_EXCEPT_START, &&TARGET_GET_AITER, &&TARGET_GET_ANEXT, &&TARGET_BEFORE_ASYNC_WITH, &&TARGET_BEFORE_WITH, &&TARGET_END_ASYNC_FOR, + &&TARGET_LOAD_METHOD_CLASS, &&TARGET_LOAD_METHOD_MODULE, &&TARGET_LOAD_METHOD_NO_DICT, &&TARGET_LOAD_METHOD_WITH_DICT, &&TARGET_LOAD_METHOD_WITH_VALUES, - &&TARGET_PRECALL_ADAPTIVE, &&TARGET_STORE_SUBSCR, &&TARGET_DELETE_SUBSCR, + &&TARGET_PRECALL_ADAPTIVE, &&TARGET_PRECALL_BOUND_METHOD, &&TARGET_PRECALL_BUILTIN_CLASS, &&TARGET_PRECALL_BUILTIN_FAST_WITH_KEYWORDS, &&TARGET_PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS, &&TARGET_PRECALL_NO_KW_BUILTIN_FAST, - &&TARGET_PRECALL_NO_KW_BUILTIN_O, &&TARGET_GET_ITER, &&TARGET_GET_YIELD_FROM_ITER, &&TARGET_PRINT_EXPR, &&TARGET_LOAD_BUILD_CLASS, + &&TARGET_PRECALL_NO_KW_BUILTIN_O, &&TARGET_PRECALL_NO_KW_ISINSTANCE, - &&TARGET_PRECALL_NO_KW_LEN, &&TARGET_LOAD_ASSERTION_ERROR, &&TARGET_RETURN_GENERATOR, + &&TARGET_PRECALL_NO_KW_LEN, &&TARGET_PRECALL_NO_KW_LIST_APPEND, &&TARGET_PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST, &&TARGET_PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS, &&TARGET_PRECALL_NO_KW_METHOD_DESCRIPTOR_O, &&TARGET_PRECALL_NO_KW_STR_1, - &&TARGET_PRECALL_NO_KW_TUPLE_1, &&TARGET_LIST_TO_TUPLE, &&TARGET_RETURN_VALUE, &&TARGET_IMPORT_STAR, @@ -112,7 +112,7 @@ static void *opcode_targets[256] = { &&TARGET_JUMP_FORWARD, &&TARGET_JUMP_IF_FALSE_OR_POP, &&TARGET_JUMP_IF_TRUE_OR_POP, - &&TARGET_PRECALL_NO_KW_TYPE_1, + &&TARGET_PRECALL_NO_KW_TUPLE_1, &&TARGET_POP_JUMP_IF_FALSE, &&TARGET_POP_JUMP_IF_TRUE, &&TARGET_LOAD_GLOBAL, @@ -120,7 +120,7 @@ static void *opcode_targets[256] = { &&TARGET_CONTAINS_OP, &&TARGET_RERAISE, &&TARGET_COPY, - &&TARGET_JUMP_IF_NOT_EXC_MATCH, + &&TARGET_PRECALL_NO_KW_TYPE_1, &&TARGET_BINARY_OP, &&TARGET_SEND, &&TARGET_LOAD_FAST,

1 0

bpo-46841: Use a `bytes` object for `_co_code_adaptive` (GH-32205)
by markshannon April 1, 2022

April 1, 2022

https://github.com/python/cpython/commit/ae9de82e321581e1906c6ef2a7ad83ab30… commit: ae9de82e321581e1906c6ef2a7ad83ab30ae3325 branch: main author: Brandt Bucher <brandtbucher(a)microsoft.com> committer: markshannon <mark(a)hotpy.org> date: 2022-04-01T12:28:50+01:00 summary: bpo-46841: Use a `bytes` object for `_co_code_adaptive` (GH-32205) files: M Objects/codeobject.c diff --git a/Objects/codeobject.c b/Objects/codeobject.c index 987cdef3c90d4..7d50b40ec4536 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -1523,8 +1523,8 @@ code_getfreevars(PyCodeObject *code, void *closure) static PyObject * code_getcodeadaptive(PyCodeObject *code, void *closure) { - return PyMemoryView_FromMemory(code->co_code_adaptive, _PyCode_NBYTES(code), - PyBUF_READ); + return PyBytes_FromStringAndSize(code->co_code_adaptive, + _PyCode_NBYTES(code)); } static PyObject *

1 0

bpo-46841: Avoid unnecessary allocations in code object comparisons (GH-32222)
by markshannon April 1, 2022

April 1, 2022

https://github.com/python/cpython/commit/bd2e47c8830d1b2869f2b4345945a5e0c3… commit: bd2e47c8830d1b2869f2b4345945a5e0c3b4e3fb branch: main author: Brandt Bucher <brandtbucher(a)microsoft.com> committer: markshannon <mark(a)hotpy.org> date: 2022-04-01T11:42:46+01:00 summary: bpo-46841: Avoid unnecessary allocations in code object comparisons (GH-32222) files: A Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-57-42.bpo-46841.U-25Z6.rst M Objects/codeobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-57-42.bpo-46841.U-25Z6.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-57-42.bpo-46841.U-25Z6.rst new file mode 100644 index 0000000000000..42711cd40f396 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-57-42.bpo-46841.U-25Z6.rst @@ -0,0 +1 @@ +Avoid unnecessary allocations when comparing code objects. diff --git a/Objects/codeobject.c b/Objects/codeobject.c index 224493edb19ea..987cdef3c90d4 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -1398,21 +1398,21 @@ code_richcompare(PyObject *self, PyObject *other, int op) if (!eq) goto unequal; eq = co->co_firstlineno == cp->co_firstlineno; if (!eq) goto unequal; - PyObject *co_code = _PyCode_GetCode(co); - if (co_code == NULL) { - return NULL; - } - PyObject *cp_code = _PyCode_GetCode(cp); - if (cp_code == NULL) { - Py_DECREF(co_code); - return NULL; - } - eq = PyObject_RichCompareBool(co_code, cp_code, Py_EQ); - Py_DECREF(co_code); - Py_DECREF(cp_code); - if (eq <= 0) { + eq = Py_SIZE(co) == Py_SIZE(cp); + if (!eq) { goto unequal; } + for (int i = 0; i < Py_SIZE(co); i++) { + _Py_CODEUNIT co_instr = _PyCode_CODE(co)[i]; + _Py_CODEUNIT cp_instr = _PyCode_CODE(cp)[i]; + _Py_SET_OPCODE(co_instr, _PyOpcode_Deopt[_Py_OPCODE(co_instr)]); + _Py_SET_OPCODE(cp_instr, _PyOpcode_Deopt[_Py_OPCODE(cp_instr)]); + eq = co_instr == cp_instr; + if (!eq) { + goto unequal; + } + i += _PyOpcode_Caches[_Py_OPCODE(co_instr)]; + } /* compare constants */ consts1 = _PyCode_ConstantKey(co->co_consts);

1 0

bpo-47009: Streamline list.append for the common case (GH-31864)
by markshannon April 1, 2022

April 1, 2022

https://github.com/python/cpython/commit/a0ea7a116ce52a178c02d42b684089758b… commit: a0ea7a116ce52a178c02d42b684089758bd7f355 branch: main author: Dennis Sweeney <36520290+sweeneyde(a)users.noreply.github.com> committer: markshannon <mark(a)hotpy.org> date: 2022-04-01T11:23:42+01:00 summary: bpo-47009: Streamline list.append for the common case (GH-31864) files: A Misc/NEWS.d/next/Core and Builtins/2022-03-14-09-45-10.bpo-47009.ZI05b5.rst M Include/internal/pycore_list.h M Objects/listobject.c M Python/ceval.c diff --git a/Include/internal/pycore_list.h b/Include/internal/pycore_list.h index 0717a1f9563a2..860dce1fd5d39 100644 --- a/Include/internal/pycore_list.h +++ b/Include/internal/pycore_list.h @@ -37,6 +37,24 @@ struct _Py_list_state { #define _PyList_ITEMS(op) (_PyList_CAST(op)->ob_item) +extern int +_PyList_AppendTakeRefListResize(PyListObject *self, PyObject *newitem); + +static inline int +_PyList_AppendTakeRef(PyListObject *self, PyObject *newitem) +{ + assert(self != NULL && newitem != NULL); + assert(PyList_Check(self)); + Py_ssize_t len = PyList_GET_SIZE(self); + Py_ssize_t allocated = self->allocated; + assert((size_t)len + 1 < PY_SSIZE_T_MAX); + if (allocated > len) { + PyList_SET_ITEM(self, len, newitem); + Py_SET_SIZE(self, len + 1); + return 0; + } + return _PyList_AppendTakeRefListResize(self, newitem); +} #ifdef __cplusplus } diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-14-09-45-10.bpo-47009.ZI05b5.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-14-09-45-10.bpo-47009.ZI05b5.rst new file mode 100644 index 0000000000000..0c65c34d310ec --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-14-09-45-10.bpo-47009.ZI05b5.rst @@ -0,0 +1 @@ +Improved the performance of :meth:`list.append()` and list comprehensions by optimizing for the common case, where no resize is needed. Patch by Dennis Sweeney. diff --git a/Objects/listobject.c b/Objects/listobject.c index d50633d2b3132..ccb9b91ba930d 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -301,26 +301,27 @@ PyList_Insert(PyObject *op, Py_ssize_t where, PyObject *newitem) return ins1((PyListObject *)op, where, newitem); } -static int -app1(PyListObject *self, PyObject *v) +/* internal, used by _PyList_AppendTakeRef */ +int +_PyList_AppendTakeRefListResize(PyListObject *self, PyObject *newitem) { - Py_ssize_t n = PyList_GET_SIZE(self); - - assert (v != NULL); - assert((size_t)n + 1 < PY_SSIZE_T_MAX); - if (list_resize(self, n+1) < 0) + Py_ssize_t len = PyList_GET_SIZE(self); + assert(self->allocated == -1 || self->allocated == len); + if (list_resize(self, len + 1) < 0) { + Py_DECREF(newitem); return -1; - - Py_INCREF(v); - PyList_SET_ITEM(self, n, v); + } + PyList_SET_ITEM(self, len, newitem); return 0; } int PyList_Append(PyObject *op, PyObject *newitem) { - if (PyList_Check(op) && (newitem != NULL)) - return app1((PyListObject *)op, newitem); + if (PyList_Check(op) && (newitem != NULL)) { + Py_INCREF(newitem); + return _PyList_AppendTakeRef((PyListObject *)op, newitem); + } PyErr_BadInternalCall(); return -1; } @@ -844,9 +845,10 @@ static PyObject * list_append(PyListObject *self, PyObject *object) /*[clinic end generated code: output=7c096003a29c0eae input=43a3fe48a7066e91]*/ { - if (app1(self, object) == 0) - Py_RETURN_NONE; - return NULL; + if (_PyList_AppendTakeRef(self, Py_NewRef(object)) < 0) { + return NULL; + } + Py_RETURN_NONE; } /*[clinic input] @@ -963,9 +965,7 @@ list_extend(PyListObject *self, PyObject *iterable) Py_SET_SIZE(self, Py_SIZE(self) + 1); } else { - int status = app1(self, item); - Py_DECREF(item); /* append creates a new ref */ - if (status < 0) + if (_PyList_AppendTakeRef(self, item) < 0) goto error; } } diff --git a/Python/ceval.c b/Python/ceval.c index 8f73ea1c01ac5..8c1f21b086da9 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2213,10 +2213,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int TARGET(LIST_APPEND) { PyObject *v = POP(); PyObject *list = PEEK(oparg); - int err; - err = PyList_Append(list, v); - Py_DECREF(v); - if (err != 0) + if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto error; PREDICT(JUMP_BACKWARD_QUICK); DISPATCH(); @@ -5044,14 +5041,12 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int DEOPT_IF(!PyList_Check(list), PRECALL); STAT_INC(PRECALL, hit); SKIP_CALL(); - PyObject *arg = TOP(); - int err = PyList_Append(list, arg); - if (err) { + PyObject *arg = POP(); + if (_PyList_AppendTakeRef((PyListObject *)list, arg) < 0) { goto error; } - Py_DECREF(arg); Py_DECREF(list); - STACK_SHRINK(2); + STACK_SHRINK(1); Py_INCREF(Py_None); SET_TOP(Py_None); Py_DECREF(callable);

1 0

bpo-46850: Move _PyInterpreterState_SetEvalFrameFunc() to internal C API (GH-32054)
by vstinner April 1, 2022

April 1, 2022

https://github.com/python/cpython/commit/f877b40e3f7e0d97878884d80fbec879a8… commit: f877b40e3f7e0d97878884d80fbec879a85ab7e8 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2022-04-01T10:55:00+02:00 summary: bpo-46850: Move _PyInterpreterState_SetEvalFrameFunc() to internal C API (GH-32054) Move the private _PyFrameEvalFunction type, and private _PyInterpreterState_GetEvalFrameFunc() and _PyInterpreterState_SetEvalFrameFunc() functions to the internal C API. The _PyFrameEvalFunction callback function type now uses the _PyInterpreterFrame type which is part of the internal C API. Update the _PyFrameEvalFunction documentation. files: A Misc/NEWS.d/next/C API/2022-03-22-16-59-34.bpo-46850.lmEKLy.rst M Doc/c-api/init.rst M Doc/whatsnew/3.11.rst M Include/cpython/pystate.h M Include/internal/pycore_interp.h M Include/internal/pycore_pystate.h diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index 322b9e4d251e7..152d4c8e5036b 100644 --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -1228,18 +1228,25 @@ All of the following functions must be called after :c:func:`Py_Initialize`. .. versionadded:: 3.8 -.. c:type:: PyObject* (*_PyFrameEvalFunction)(PyThreadState *tstate, PyFrameObject *frame, int throwflag) +.. c:type:: PyObject* (*_PyFrameEvalFunction)(PyThreadState *tstate, _PyInterpreterFrame *frame, int throwflag) + + Internal C API. Type of a frame evaluation function. The *throwflag* parameter is used by the ``throw()`` method of generators: if non-zero, handle the current exception. + .. versionchanged:: 3.11 + The second parameter type becomes ``_PyInterpreterFrame``. + .. versionchanged:: 3.9 The function now takes a *tstate* parameter. .. c:function:: _PyFrameEvalFunction _PyInterpreterState_GetEvalFrameFunc(PyInterpreterState *interp) + Internal C API. + Get the frame evaluation function. See the :pep:`523` "Adding a frame evaluation API to CPython". @@ -1248,6 +1255,8 @@ All of the following functions must be called after :c:func:`Py_Initialize`. .. c:function:: void _PyInterpreterState_SetEvalFrameFunc(PyInterpreterState *interp, _PyFrameEvalFunction eval_frame) + Internal C API. + Set the frame evaluation function. See the :pep:`523` "Adding a frame evaluation API to CPython". diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst index 15f765dbe806e..15808679f7fd5 100644 --- a/Doc/whatsnew/3.11.rst +++ b/Doc/whatsnew/3.11.rst @@ -1102,6 +1102,12 @@ Porting to Python 3.11 is part of the internal C API. (Contributed by Victor Stinner in :issue:`46850`.) +* Move the private ``_PyFrameEvalFunction`` type, and private + ``_PyInterpreterState_GetEvalFrameFunc()`` and + ``_PyInterpreterState_SetEvalFrameFunc()`` functions to the internal C API. + The ``_PyFrameEvalFunction`` callback function type now uses the + ``_PyInterpreterFrame`` type which is part of the internal C API. + (Contributed by Victor Stinner in :issue:`46850`.) Deprecated ---------- diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h index 1af21a2c947d9..e346d744b6f12 100644 --- a/Include/cpython/pystate.h +++ b/Include/cpython/pystate.h @@ -259,16 +259,6 @@ PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *); PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *); PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); -/* Frame evaluation API */ - -typedef PyObject* (*_PyFrameEvalFunction)(PyThreadState *tstate, struct _PyInterpreterFrame *, int); - -PyAPI_FUNC(_PyFrameEvalFunction) _PyInterpreterState_GetEvalFrameFunc( - PyInterpreterState *interp); -PyAPI_FUNC(void) _PyInterpreterState_SetEvalFrameFunc( - PyInterpreterState *interp, - _PyFrameEvalFunction eval_frame); - PyAPI_FUNC(const PyConfig*) _PyInterpreterState_GetConfig(PyInterpreterState *interp); /* Get a copy of the current interpreter configuration. diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h index d55627908a28f..592d438bcf1d2 100644 --- a/Include/internal/pycore_interp.h +++ b/Include/internal/pycore_interp.h @@ -17,9 +17,9 @@ extern "C" { #include "pycore_dict.h" // struct _Py_dict_state #include "pycore_exceptions.h" // struct _Py_exc_state #include "pycore_floatobject.h" // struct _Py_float_state +#include "pycore_gc.h" // struct _gc_runtime_state #include "pycore_genobject.h" // struct _Py_async_gen_state #include "pycore_gil.h" // struct _gil_runtime_state -#include "pycore_gc.h" // struct _gc_runtime_state #include "pycore_list.h" // struct _Py_list_state #include "pycore_tuple.h" // struct _Py_tuple_state #include "pycore_typeobject.h" // struct type_cache @@ -71,6 +71,20 @@ struct atexit_state { }; +/* Frame evaluation API (PEP 523) */ + +typedef PyObject* (*_PyFrameEvalFunction) ( + PyThreadState *tstate, + struct _PyInterpreterFrame *frame, + int throwflag); + +PyAPI_FUNC(_PyFrameEvalFunction) _PyInterpreterState_GetEvalFrameFunc( + PyInterpreterState *interp); +PyAPI_FUNC(void) _PyInterpreterState_SetEvalFrameFunc( + PyInterpreterState *interp, + _PyFrameEvalFunction eval_frame); + + /* interpreter state */ /* PyInterpreterState holds the global state for one of the runtime's diff --git a/Include/internal/pycore_pystate.h b/Include/internal/pycore_pystate.h index c4bc53c707fda..c463347dbf06a 100644 --- a/Include/internal/pycore_pystate.h +++ b/Include/internal/pycore_pystate.h @@ -8,7 +8,7 @@ extern "C" { # error "this header requires Py_BUILD_CORE define" #endif -#include "pycore_runtime.h" /* PyRuntimeState */ +#include "pycore_runtime.h" // _PyRuntime /* Check if the current thread is the main thread. diff --git a/Misc/NEWS.d/next/C API/2022-03-22-16-59-34.bpo-46850.lmEKLy.rst b/Misc/NEWS.d/next/C API/2022-03-22-16-59-34.bpo-46850.lmEKLy.rst new file mode 100644 index 0000000000000..d32cc3448721e --- /dev/null +++ b/Misc/NEWS.d/next/C API/2022-03-22-16-59-34.bpo-46850.lmEKLy.rst @@ -0,0 +1,6 @@ +Move the private ``_PyFrameEvalFunction`` type, and private +``_PyInterpreterState_GetEvalFrameFunc()`` and +``_PyInterpreterState_SetEvalFrameFunc()`` functions to the internal C API. The +``_PyFrameEvalFunction`` callback function type now uses the +``_PyInterpreterFrame`` type which is part of the internal C API. Patch by +Victor Stinner.

1 0

[3.10] bpo-47182: Fix crash by named unicode characters after interpreter reinitialization (GH-32212) (GH-32216)
by tiran April 1, 2022

April 1, 2022

https://github.com/python/cpython/commit/55d5c96c57738766eb6f3b5ccfa6599d5f… commit: 55d5c96c57738766eb6f3b5ccfa6599d5f094c18 branch: 3.10 author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2022-04-01T10:44:56+02:00 summary: [3.10] bpo-47182: Fix crash by named unicode characters after interpreter reinitialization (GH-32212) (GH-32216) Co-authored-by: Christian Heimes <christian(a)python.org> files: A Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-37-02.bpo-47182.e_4SsC.rst M Objects/unicodeobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-37-02.bpo-47182.e_4SsC.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-37-02.bpo-47182.e_4SsC.rst new file mode 100644 index 0000000000000..08036bc680933 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-31-15-37-02.bpo-47182.e_4SsC.rst @@ -0,0 +1,2 @@ +Fix a crash when using a named unicode character like ``"\N{digit nine}"`` +after the main interpreter has been initialized a second time. diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 077cf8d7f4560..377fa6c8e2a28 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -16352,6 +16352,9 @@ _PyUnicode_Fini(PyInterpreterState *interp) if (_Py_IsMainInterpreter(interp)) { // _PyUnicode_ClearInterned() must be called before _PyUnicode_Fini() assert(interned == NULL); + // bpo-47182: force a unicodedata CAPI capsule re-import on + // subsequent initialization of main interpreter. + ucnhash_capi = NULL; } _PyUnicode_FiniEncodings(&state->fs_codec);

1 0

bpo-46850: Move _PyEval_EvalFrameDefault() to internal C API (GH-32052)
by vstinner April 1, 2022

April 1, 2022

https://github.com/python/cpython/commit/b9a5522dd952125a99ff554f01f311cae2… commit: b9a5522dd952125a99ff554f01f311cae25f5a91 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2022-04-01T10:17:57+02:00 summary: bpo-46850: Move _PyEval_EvalFrameDefault() to internal C API (GH-32052) Move the private undocumented _PyEval_EvalFrameDefault() function to the internal C API. The function now uses the _PyInterpreterFrame type which is part of the internal C API. files: A Misc/NEWS.d/next/C API/2022-03-22-16-48-02.bpo-46850.7M5dO7.rst M Doc/whatsnew/3.11.rst M Include/cpython/ceval.h M Include/internal/pycore_ceval.h diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst index 16715c32502e4..15f765dbe806e 100644 --- a/Doc/whatsnew/3.11.rst +++ b/Doc/whatsnew/3.11.rst @@ -1097,6 +1097,11 @@ Porting to Python 3.11 * Distributors are encouraged to build Python with the optimized Blake2 library `libb2`_. +* Move the private undocumented ``_PyEval_EvalFrameDefault()`` function to the + internal C API. The function now uses the ``_PyInterpreterFrame`` type which + is part of the internal C API. + (Contributed by Victor Stinner in :issue:`46850`.) + Deprecated ---------- diff --git a/Include/cpython/ceval.h b/Include/cpython/ceval.h index 9d4eeafb427eb..65aae2d669a52 100644 --- a/Include/cpython/ceval.h +++ b/Include/cpython/ceval.h @@ -15,8 +15,6 @@ PyAPI_FUNC(PyObject *) _PyEval_GetBuiltinId(_Py_Identifier *); flag was set, else return 0. */ PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf); -PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault(PyThreadState *tstate, struct _PyInterpreterFrame *f, int exc); - PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds); PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void); diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h index 45d26a37a34c6..b29b496ee3f58 100644 --- a/Include/internal/pycore_ceval.h +++ b/Include/internal/pycore_ceval.h @@ -59,6 +59,11 @@ extern PyObject* _PyEval_BuiltinsFromGlobals( PyObject *globals); +PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault( + PyThreadState *tstate, + struct _PyInterpreterFrame *frame, + int throwflag); + static inline PyObject* _PyEval_EvalFrame(PyThreadState *tstate, struct _PyInterpreterFrame *frame, int throwflag) { diff --git a/Misc/NEWS.d/next/C API/2022-03-22-16-48-02.bpo-46850.7M5dO7.rst b/Misc/NEWS.d/next/C API/2022-03-22-16-48-02.bpo-46850.7M5dO7.rst new file mode 100644 index 0000000000000..1519ac7890e37 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2022-03-22-16-48-02.bpo-46850.7M5dO7.rst @@ -0,0 +1,3 @@ +Move the private undocumented ``_PyEval_EvalFrameDefault()`` function to the +internal C API. The function now uses the ``_PyInterpreterFrame`` type which is +part of the internal C API. Patch by Victor Stinner.

1 0

bpo-47167: Allow overriding a future compliance check in asyncio.Task (GH-32197)
by asvetlov March 31, 2022

March 31, 2022

https://github.com/python/cpython/commit/d4bb38f82bf18b00db3129031ce4969b6f… commit: d4bb38f82bf18b00db3129031ce4969b6f0caab9 branch: main author: Andrew Svetlov <andrew.svetlov(a)gmail.com> committer: asvetlov <andrew.svetlov(a)gmail.com> date: 2022-04-01T04:25:15+03:00 summary: bpo-47167: Allow overriding a future compliance check in asyncio.Task (GH-32197) files: A Misc/NEWS.d/next/Library/2022-03-30-18-35-50.bpo-47167.nCNHsB.rst M Doc/library/asyncio-extending.rst M Lib/asyncio/tasks.py M Lib/test/test_asyncio/test_tasks.py M Modules/_asynciomodule.c M Modules/clinic/_asynciomodule.c.h diff --git a/Doc/library/asyncio-extending.rst b/Doc/library/asyncio-extending.rst index 619723e61b5f9..215d215bb14fe 100644 --- a/Doc/library/asyncio-extending.rst +++ b/Doc/library/asyncio-extending.rst @@ -48,16 +48,27 @@ For this purpose the following, *private* constructors are listed: .. method:: Future.__init__(*, loop=None) -Create a built-in future instance. + Create a built-in future instance. -*loop* is an optional event loop instance. + *loop* is an optional event loop instance. .. method:: Task.__init__(coro, *, loop=None, name=None, context=None) -Create a built-in task instance. + Create a built-in task instance. -*loop* is an optional event loop instance. The rest of arguments are described in -:meth:`loop.create_task` description. + *loop* is an optional event loop instance. The rest of arguments are described in + :meth:`loop.create_task` description. + + .. versionchanged:: 3.11 + + *context* argument is added. + +.. method:: Tasl._check_future(future) + + Return ``True`` if *future* is attached to the same loop as the task, ``False`` + otherwise. + + .. versionadded:: 3.11 Task lifetime support diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 27fe58da15136..3952b5f2a7743 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -252,6 +252,10 @@ def uncancel(self): self._num_cancels_requested -= 1 return self._num_cancels_requested + def _check_future(self, future): + """Return False if task and future loops are not compatible.""" + return futures._get_loop(future) is self._loop + def __step(self, exc=None): if self.done(): raise exceptions.InvalidStateError( @@ -292,7 +296,7 @@ def __step(self, exc=None): blocking = getattr(result, '_asyncio_future_blocking', None) if blocking is not None: # Yielded Future must come from Future.__iter__(). - if futures._get_loop(result) is not self._loop: + if not self._check_future(result): new_exc = RuntimeError( f'Task {self!r} got Future ' f'{result!r} attached to a different loop') diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py index 8df1957bbe9e7..80afb27351362 100644 --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -2383,7 +2383,13 @@ def add_done_callback(self, *args, **kwargs): return super().add_done_callback(*args, **kwargs) class Task(CommonFuture, BaseTask): - pass + def __init__(self, *args, **kwargs): + self._check_future_called = 0 + super().__init__(*args, **kwargs) + + def _check_future(self, future): + self._check_future_called += 1 + return super()._check_future(future) class Future(CommonFuture, BaseFuture): pass @@ -2409,6 +2415,8 @@ async def func(): dict(fut.calls), {'add_done_callback': 1}) + self.assertEqual(1, task._check_future_called) + # Add patched Task & Future back to the test case cls.Task = Task cls.Future = Future diff --git a/Misc/NEWS.d/next/Library/2022-03-30-18-35-50.bpo-47167.nCNHsB.rst b/Misc/NEWS.d/next/Library/2022-03-30-18-35-50.bpo-47167.nCNHsB.rst new file mode 100644 index 0000000000000..a37dd25810f2e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-03-30-18-35-50.bpo-47167.nCNHsB.rst @@ -0,0 +1 @@ +Allow overriding a future compliance check in :class:`asyncio.Task`. diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c index 632a4465c224a..d8d3da91cdd8e 100644 --- a/Modules/_asynciomodule.c +++ b/Modules/_asynciomodule.c @@ -23,6 +23,7 @@ _Py_IDENTIFIER(call_soon); _Py_IDENTIFIER(cancel); _Py_IDENTIFIER(get_event_loop); _Py_IDENTIFIER(throw); +_Py_IDENTIFIER(_check_future); /* State of the _asyncio module */ @@ -1795,6 +1796,8 @@ class _asyncio.Task "TaskObj *" "&Task_Type" static int task_call_step_soon(TaskObj *, PyObject *); static PyObject * task_wakeup(TaskObj *, PyObject *); static PyObject * task_step(TaskObj *, PyObject *); +static int task_check_future(TaskObj *, PyObject *); +static int task_check_future_exact(TaskObj *, PyObject *); /* ----- Task._step wrapper */ @@ -2269,7 +2272,6 @@ Returns the remaining number of cancellation requests. static PyObject * _asyncio_Task_uncancel_impl(TaskObj *self) /*[clinic end generated code: output=58184d236a817d3c input=68f81a4b90b46be2]*/ -/*[clinic end generated code]*/ { if (self->task_num_cancels_requested > 0) { self->task_num_cancels_requested -= 1; @@ -2277,6 +2279,21 @@ _asyncio_Task_uncancel_impl(TaskObj *self) return PyLong_FromLong(self->task_num_cancels_requested); } +/*[clinic input] +_asyncio.Task._check_future -> bool + + future: object + +Return False if task and future loops are not compatible. +[clinic start generated code]*/ + +static int +_asyncio_Task__check_future_impl(TaskObj *self, PyObject *future) +/*[clinic end generated code: output=a3bfba79295c8d57 input=3b1d6dfd6fe90aa5]*/ +{ + return task_check_future_exact(self, future); +} + /*[clinic input] _asyncio.Task.get_stack @@ -2502,6 +2519,7 @@ static PyMethodDef TaskType_methods[] = { _ASYNCIO_TASK_CANCEL_METHODDEF _ASYNCIO_TASK_CANCELLING_METHODDEF _ASYNCIO_TASK_UNCANCEL_METHODDEF + _ASYNCIO_TASK__CHECK_FUTURE_METHODDEF _ASYNCIO_TASK_GET_STACK_METHODDEF _ASYNCIO_TASK_PRINT_STACK_METHODDEF _ASYNCIO_TASK__MAKE_CANCELLED_ERROR_METHODDEF @@ -2569,6 +2587,43 @@ TaskObj_dealloc(PyObject *self) Py_TYPE(task)->tp_free(task); } +static int +task_check_future_exact(TaskObj *task, PyObject *future) +{ + int res; + if (Future_CheckExact(future) || Task_CheckExact(future)) { + FutureObj *fut = (FutureObj *)future; + res = (fut->fut_loop == task->task_loop); + } else { + PyObject *oloop = get_future_loop(future); + if (oloop == NULL) { + return -1; + } + res = (oloop == task->task_loop); + Py_DECREF(oloop); + } + return res; +} + + +static int +task_check_future(TaskObj *task, PyObject *future) +{ + if (Task_CheckExact(task)) { + return task_check_future_exact(task, future); + } else { + PyObject * ret = _PyObject_CallMethodIdOneArg((PyObject *)task, + &PyId__check_future, + future); + if (ret == NULL) { + return -1; + } + int is_true = PyObject_IsTrue(ret); + Py_DECREF(ret); + return is_true; + } +} + static int task_call_step_soon(TaskObj *task, PyObject *arg) { @@ -2790,7 +2845,11 @@ task_step_impl(TaskObj *task, PyObject *exc) FutureObj *fut = (FutureObj*)result; /* Check if `result` future is attached to a different loop */ - if (fut->fut_loop != task->task_loop) { + res = task_check_future(task, result); + if (res == -1) { + goto fail; + } + if (res == 0) { goto different_loop; } @@ -2862,15 +2921,13 @@ task_step_impl(TaskObj *task, PyObject *exc) } /* Check if `result` future is attached to a different loop */ - PyObject *oloop = get_future_loop(result); - if (oloop == NULL) { + res = task_check_future(task, result); + if (res == -1) { goto fail; } - if (oloop != task->task_loop) { - Py_DECREF(oloop); + if (res == 0) { goto different_loop; } - Py_DECREF(oloop); if (!blocking) { goto yield_insteadof_yf; diff --git a/Modules/clinic/_asynciomodule.c.h b/Modules/clinic/_asynciomodule.c.h index 4b64367a3f631..163b0f95691b3 100644 --- a/Modules/clinic/_asynciomodule.c.h +++ b/Modules/clinic/_asynciomodule.c.h @@ -466,6 +466,43 @@ _asyncio_Task_uncancel(TaskObj *self, PyObject *Py_UNUSED(ignored)) return _asyncio_Task_uncancel_impl(self); } +PyDoc_STRVAR(_asyncio_Task__check_future__doc__, +"_check_future($self, /, future)\n" +"--\n" +"\n" +"Return False if task and future loops are not compatible."); + +#define _ASYNCIO_TASK__CHECK_FUTURE_METHODDEF \ + {"_check_future", (PyCFunction)(void(*)(void))_asyncio_Task__check_future, METH_FASTCALL|METH_KEYWORDS, _asyncio_Task__check_future__doc__}, + +static int +_asyncio_Task__check_future_impl(TaskObj *self, PyObject *future); + +static PyObject * +_asyncio_Task__check_future(TaskObj *self, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames) +{ + PyObject *return_value = NULL; + static const char * const _keywords[] = {"future", NULL}; + static _PyArg_Parser _parser = {NULL, _keywords, "_check_future", 0}; + PyObject *argsbuf[1]; + PyObject *future; + int _return_value; + + args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf); + if (!args) { + goto exit; + } + future = args[0]; + _return_value = _asyncio_Task__check_future_impl(self, future); + if ((_return_value == -1) && PyErr_Occurred()) { + goto exit; + } + return_value = PyBool_FromLong((long)_return_value); + +exit: + return return_value; +} + PyDoc_STRVAR(_asyncio_Task_get_stack__doc__, "get_stack($self, /, *, limit=None)\n" "--\n" @@ -890,4 +927,4 @@ _asyncio__leave_task(PyObject *module, PyObject *const *args, Py_ssize_t nargs, exit: return return_value; } -/*[clinic end generated code: output=64b3836574e8a18c input=a9049054013a1b77]*/ +/*[clinic end generated code: output=fdb7129263a8712e input=a9049054013a1b77]*/

1 0