https://github.com/python/cpython/commit/ebccd1de88d4034f8aa847544e6ad35bb3381936
commit: ebccd1de88d4034f8aa847544e6ad35bb3381936
branch: 3.13
author: Kliment Lamonov <[email protected]>
committer: Fidget-Spinner <[email protected]>
date: 2025-08-22T20:25:24+08:00
summary:
[3.13] gh-132744: Check recursion limit in _PY_FRAME_GENERAL (GH-132746)
(GH-138032)
files:
A Misc/NEWS.d/next/Core and
Builtins/2025-04-20-10-37-39.gh-issue-132744.ArrCp8.rst
M Include/internal/pycore_opcode_metadata.h
M Include/internal/pycore_uop_ids.h
M Include/internal/pycore_uop_metadata.h
M Lib/test/test_opcache.py
M Python/bytecodes.c
M Python/executor_cases.c.h
M Python/generated_cases.c.h
M Python/optimizer_cases.c.h
diff --git a/Include/internal/pycore_opcode_metadata.h
b/Include/internal/pycore_opcode_metadata.h
index bbba0bbbf4b0aa..a3d31bcbc4ab54 100644
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -1190,7 +1190,7 @@ const struct opcode_metadata
_PyOpcode_opcode_metadata[268] = {
};
#endif
-#define MAX_UOP_PER_EXPANSION 8
+#define MAX_UOP_PER_EXPANSION 9
struct opcode_macro_expansion {
int nuops;
struct { int16_t uop; int8_t size; int8_t offset; }
uops[MAX_UOP_PER_EXPANSION];
@@ -1220,8 +1220,8 @@ _PyOpcode_macro_expansion[256] = {
[BUILD_SLICE] = { .nuops = 1, .uops = { { _BUILD_SLICE, 0, 0 } } },
[BUILD_STRING] = { .nuops = 1, .uops = { { _BUILD_STRING, 0, 0 } } },
[BUILD_TUPLE] = { .nuops = 1, .uops = { { _BUILD_TUPLE, 0, 0 } } },
- [CALL_BOUND_METHOD_EXACT_ARGS] = { .nuops = 8, .uops = { { _CHECK_PEP_523,
0, 0 }, { _CHECK_CALL_BOUND_METHOD_EXACT_ARGS, 0, 0 }, {
_INIT_CALL_BOUND_METHOD_EXACT_ARGS, 0, 0 }, { _CHECK_FUNCTION_EXACT_ARGS, 2, 1
}, { _CHECK_STACK_SPACE, 0, 0 }, { _INIT_CALL_PY_EXACT_ARGS, 0, 0 }, {
_SAVE_RETURN_OFFSET, 7, 3 }, { _PUSH_FRAME, 0, 0 } } },
- [CALL_BOUND_METHOD_GENERAL] = { .nuops = 6, .uops = { { _CHECK_PEP_523, 0,
0 }, { _CHECK_METHOD_VERSION, 2, 1 }, { _EXPAND_METHOD, 0, 0 }, {
_PY_FRAME_GENERAL, 0, 0 }, { _SAVE_RETURN_OFFSET, 7, 3 }, { _PUSH_FRAME, 0, 0 }
} },
+ [CALL_BOUND_METHOD_EXACT_ARGS] = { .nuops = 9, .uops = { { _CHECK_PEP_523,
0, 0 }, { _CHECK_CALL_BOUND_METHOD_EXACT_ARGS, 0, 0 }, {
_INIT_CALL_BOUND_METHOD_EXACT_ARGS, 0, 0 }, { _CHECK_FUNCTION_EXACT_ARGS, 2, 1
}, { _CHECK_STACK_SPACE, 0, 0 }, { _CHECK_RECURSION_REMAINING, 0, 0 }, {
_INIT_CALL_PY_EXACT_ARGS, 0, 0 }, { _SAVE_RETURN_OFFSET, 7, 3 }, { _PUSH_FRAME,
0, 0 } } },
+ [CALL_BOUND_METHOD_GENERAL] = { .nuops = 7, .uops = { { _CHECK_PEP_523, 0,
0 }, { _CHECK_METHOD_VERSION, 2, 1 }, { _EXPAND_METHOD, 0, 0 }, {
_CHECK_RECURSION_REMAINING, 0, 0 }, { _PY_FRAME_GENERAL, 0, 0 }, {
_SAVE_RETURN_OFFSET, 7, 3 }, { _PUSH_FRAME, 0, 0 } } },
[CALL_BUILTIN_CLASS] = { .nuops = 2, .uops = { { _CALL_BUILTIN_CLASS, 0, 0
}, { _CHECK_PERIODIC, 0, 0 } } },
[CALL_BUILTIN_FAST] = { .nuops = 2, .uops = { { _CALL_BUILTIN_FAST, 0, 0
}, { _CHECK_PERIODIC, 0, 0 } } },
[CALL_BUILTIN_FAST_WITH_KEYWORDS] = { .nuops = 2, .uops = { {
_CALL_BUILTIN_FAST_WITH_KEYWORDS, 0, 0 }, { _CHECK_PERIODIC, 0, 0 } } },
@@ -1235,8 +1235,8 @@ _PyOpcode_macro_expansion[256] = {
[CALL_METHOD_DESCRIPTOR_NOARGS] = { .nuops = 2, .uops = { {
_CALL_METHOD_DESCRIPTOR_NOARGS, 0, 0 }, { _CHECK_PERIODIC, 0, 0 } } },
[CALL_METHOD_DESCRIPTOR_O] = { .nuops = 2, .uops = { {
_CALL_METHOD_DESCRIPTOR_O, 0, 0 }, { _CHECK_PERIODIC, 0, 0 } } },
[CALL_NON_PY_GENERAL] = { .nuops = 3, .uops = { {
_CHECK_IS_NOT_PY_CALLABLE, 0, 0 }, { _CALL_NON_PY_GENERAL, 0, 0 }, {
_CHECK_PERIODIC, 0, 0 } } },
- [CALL_PY_EXACT_ARGS] = { .nuops = 6, .uops = { { _CHECK_PEP_523, 0, 0 }, {
_CHECK_FUNCTION_EXACT_ARGS, 2, 1 }, { _CHECK_STACK_SPACE, 0, 0 }, {
_INIT_CALL_PY_EXACT_ARGS, 0, 0 }, { _SAVE_RETURN_OFFSET, 7, 3 }, { _PUSH_FRAME,
0, 0 } } },
- [CALL_PY_GENERAL] = { .nuops = 5, .uops = { { _CHECK_PEP_523, 0, 0 }, {
_CHECK_FUNCTION_VERSION, 2, 1 }, { _PY_FRAME_GENERAL, 0, 0 }, {
_SAVE_RETURN_OFFSET, 7, 3 }, { _PUSH_FRAME, 0, 0 } } },
+ [CALL_PY_EXACT_ARGS] = { .nuops = 7, .uops = { { _CHECK_PEP_523, 0, 0 }, {
_CHECK_FUNCTION_EXACT_ARGS, 2, 1 }, { _CHECK_STACK_SPACE, 0, 0 }, {
_CHECK_RECURSION_REMAINING, 0, 0 }, { _INIT_CALL_PY_EXACT_ARGS, 0, 0 }, {
_SAVE_RETURN_OFFSET, 7, 3 }, { _PUSH_FRAME, 0, 0 } } },
+ [CALL_PY_GENERAL] = { .nuops = 6, .uops = { { _CHECK_PEP_523, 0, 0 }, {
_CHECK_FUNCTION_VERSION, 2, 1 }, { _CHECK_RECURSION_REMAINING, 0, 0 }, {
_PY_FRAME_GENERAL, 0, 0 }, { _SAVE_RETURN_OFFSET, 7, 3 }, { _PUSH_FRAME, 0, 0 }
} },
[CALL_STR_1] = { .nuops = 2, .uops = { { _CALL_STR_1, 0, 0 }, {
_CHECK_PERIODIC, 0, 0 } } },
[CALL_TUPLE_1] = { .nuops = 2, .uops = { { _CALL_TUPLE_1, 0, 0 }, {
_CHECK_PERIODIC, 0, 0 } } },
[CALL_TYPE_1] = { .nuops = 1, .uops = { { _CALL_TYPE_1, 0, 0 } } },
diff --git a/Include/internal/pycore_uop_ids.h
b/Include/internal/pycore_uop_ids.h
index 1e6ef8e54a221a..1bd5fae3b75494 100644
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -70,16 +70,17 @@ extern "C" {
#define _CHECK_METHOD_VERSION 333
#define _CHECK_PEP_523 334
#define _CHECK_PERIODIC 335
-#define _CHECK_STACK_SPACE 336
-#define _CHECK_STACK_SPACE_OPERAND 337
-#define _CHECK_VALIDITY 338
-#define _CHECK_VALIDITY_AND_SET_IP 339
-#define _COLD_EXIT 340
-#define _COMPARE_OP 341
-#define _COMPARE_OP_FLOAT 342
-#define _COMPARE_OP_INT 343
-#define _COMPARE_OP_STR 344
-#define _CONTAINS_OP 345
+#define _CHECK_RECURSION_REMAINING 336
+#define _CHECK_STACK_SPACE 337
+#define _CHECK_STACK_SPACE_OPERAND 338
+#define _CHECK_VALIDITY 339
+#define _CHECK_VALIDITY_AND_SET_IP 340
+#define _COLD_EXIT 341
+#define _COMPARE_OP 342
+#define _COMPARE_OP_FLOAT 343
+#define _COMPARE_OP_INT 344
+#define _COMPARE_OP_STR 345
+#define _CONTAINS_OP 346
#define _CONTAINS_OP_DICT CONTAINS_OP_DICT
#define _CONTAINS_OP_SET CONTAINS_OP_SET
#define _CONVERT_VALUE CONVERT_VALUE
@@ -91,53 +92,53 @@ extern "C" {
#define _DELETE_GLOBAL DELETE_GLOBAL
#define _DELETE_NAME DELETE_NAME
#define _DELETE_SUBSCR DELETE_SUBSCR
-#define _DEOPT 346
+#define _DEOPT 347
#define _DICT_MERGE DICT_MERGE
#define _DICT_UPDATE DICT_UPDATE
-#define _DYNAMIC_EXIT 347
+#define _DYNAMIC_EXIT 348
#define _END_SEND END_SEND
-#define _ERROR_POP_N 348
+#define _ERROR_POP_N 349
#define _EXIT_INIT_CHECK EXIT_INIT_CHECK
-#define _EXPAND_METHOD 349
-#define _FATAL_ERROR 350
+#define _EXPAND_METHOD 350
+#define _FATAL_ERROR 351
#define _FORMAT_SIMPLE FORMAT_SIMPLE
#define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC
-#define _FOR_ITER 351
-#define _FOR_ITER_GEN_FRAME 352
-#define _FOR_ITER_TIER_TWO 353
+#define _FOR_ITER 352
+#define _FOR_ITER_GEN_FRAME 353
+#define _FOR_ITER_TIER_TWO 354
#define _GET_AITER GET_AITER
#define _GET_ANEXT GET_ANEXT
#define _GET_AWAITABLE GET_AWAITABLE
#define _GET_ITER GET_ITER
#define _GET_LEN GET_LEN
#define _GET_YIELD_FROM_ITER GET_YIELD_FROM_ITER
-#define _GUARD_BOTH_FLOAT 354
-#define _GUARD_BOTH_INT 355
-#define _GUARD_BOTH_UNICODE 356
-#define _GUARD_BUILTINS_VERSION 357
-#define _GUARD_DORV_NO_DICT 358
-#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 359
-#define _GUARD_GLOBALS_VERSION 360
-#define _GUARD_IS_FALSE_POP 361
-#define _GUARD_IS_NONE_POP 362
-#define _GUARD_IS_NOT_NONE_POP 363
-#define _GUARD_IS_TRUE_POP 364
-#define _GUARD_KEYS_VERSION 365
-#define _GUARD_NOS_FLOAT 366
-#define _GUARD_NOS_INT 367
-#define _GUARD_NOT_EXHAUSTED_LIST 368
-#define _GUARD_NOT_EXHAUSTED_RANGE 369
-#define _GUARD_NOT_EXHAUSTED_TUPLE 370
-#define _GUARD_TOS_FLOAT 371
-#define _GUARD_TOS_INT 372
-#define _GUARD_TYPE_VERSION 373
-#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 374
-#define _INIT_CALL_PY_EXACT_ARGS 375
-#define _INIT_CALL_PY_EXACT_ARGS_0 376
-#define _INIT_CALL_PY_EXACT_ARGS_1 377
-#define _INIT_CALL_PY_EXACT_ARGS_2 378
-#define _INIT_CALL_PY_EXACT_ARGS_3 379
-#define _INIT_CALL_PY_EXACT_ARGS_4 380
+#define _GUARD_BOTH_FLOAT 355
+#define _GUARD_BOTH_INT 356
+#define _GUARD_BOTH_UNICODE 357
+#define _GUARD_BUILTINS_VERSION 358
+#define _GUARD_DORV_NO_DICT 359
+#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 360
+#define _GUARD_GLOBALS_VERSION 361
+#define _GUARD_IS_FALSE_POP 362
+#define _GUARD_IS_NONE_POP 363
+#define _GUARD_IS_NOT_NONE_POP 364
+#define _GUARD_IS_TRUE_POP 365
+#define _GUARD_KEYS_VERSION 366
+#define _GUARD_NOS_FLOAT 367
+#define _GUARD_NOS_INT 368
+#define _GUARD_NOT_EXHAUSTED_LIST 369
+#define _GUARD_NOT_EXHAUSTED_RANGE 370
+#define _GUARD_NOT_EXHAUSTED_TUPLE 371
+#define _GUARD_TOS_FLOAT 372
+#define _GUARD_TOS_INT 373
+#define _GUARD_TYPE_VERSION 374
+#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 375
+#define _INIT_CALL_PY_EXACT_ARGS 376
+#define _INIT_CALL_PY_EXACT_ARGS_0 377
+#define _INIT_CALL_PY_EXACT_ARGS_1 378
+#define _INIT_CALL_PY_EXACT_ARGS_2 379
+#define _INIT_CALL_PY_EXACT_ARGS_3 380
+#define _INIT_CALL_PY_EXACT_ARGS_4 381
#define _INSTRUMENTED_CALL INSTRUMENTED_CALL
#define _INSTRUMENTED_CALL_FUNCTION_EX INSTRUMENTED_CALL_FUNCTION_EX
#define _INSTRUMENTED_CALL_KW INSTRUMENTED_CALL_KW
@@ -154,65 +155,65 @@ extern "C" {
#define _INSTRUMENTED_RETURN_CONST INSTRUMENTED_RETURN_CONST
#define _INSTRUMENTED_RETURN_VALUE INSTRUMENTED_RETURN_VALUE
#define _INSTRUMENTED_YIELD_VALUE INSTRUMENTED_YIELD_VALUE
-#define _INTERNAL_INCREMENT_OPT_COUNTER 381
-#define _IS_NONE 382
+#define _INTERNAL_INCREMENT_OPT_COUNTER 382
+#define _IS_NONE 383
#define _IS_OP IS_OP
-#define _ITER_CHECK_LIST 383
-#define _ITER_CHECK_RANGE 384
-#define _ITER_CHECK_TUPLE 385
-#define _ITER_JUMP_LIST 386
-#define _ITER_JUMP_RANGE 387
-#define _ITER_JUMP_TUPLE 388
-#define _ITER_NEXT_LIST 389
-#define _ITER_NEXT_RANGE 390
-#define _ITER_NEXT_TUPLE 391
-#define _JUMP_TO_TOP 392
+#define _ITER_CHECK_LIST 384
+#define _ITER_CHECK_RANGE 385
+#define _ITER_CHECK_TUPLE 386
+#define _ITER_JUMP_LIST 387
+#define _ITER_JUMP_RANGE 388
+#define _ITER_JUMP_TUPLE 389
+#define _ITER_NEXT_LIST 390
+#define _ITER_NEXT_RANGE 391
+#define _ITER_NEXT_TUPLE 392
+#define _JUMP_TO_TOP 393
#define _LIST_APPEND LIST_APPEND
#define _LIST_EXTEND LIST_EXTEND
#define _LOAD_ASSERTION_ERROR LOAD_ASSERTION_ERROR
-#define _LOAD_ATTR 393
-#define _LOAD_ATTR_CLASS 394
-#define _LOAD_ATTR_CLASS_0 395
-#define _LOAD_ATTR_CLASS_1 396
+#define _LOAD_ATTR 394
+#define _LOAD_ATTR_CLASS 395
+#define _LOAD_ATTR_CLASS_0 396
+#define _LOAD_ATTR_CLASS_1 397
#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN
-#define _LOAD_ATTR_INSTANCE_VALUE 397
-#define _LOAD_ATTR_INSTANCE_VALUE_0 398
-#define _LOAD_ATTR_INSTANCE_VALUE_1 399
-#define _LOAD_ATTR_METHOD_LAZY_DICT 400
-#define _LOAD_ATTR_METHOD_NO_DICT 401
-#define _LOAD_ATTR_METHOD_WITH_VALUES 402
-#define _LOAD_ATTR_MODULE 403
-#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 404
-#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 405
+#define _LOAD_ATTR_INSTANCE_VALUE 398
+#define _LOAD_ATTR_INSTANCE_VALUE_0 399
+#define _LOAD_ATTR_INSTANCE_VALUE_1 400
+#define _LOAD_ATTR_METHOD_LAZY_DICT 401
+#define _LOAD_ATTR_METHOD_NO_DICT 402
+#define _LOAD_ATTR_METHOD_WITH_VALUES 403
+#define _LOAD_ATTR_MODULE 404
+#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 405
+#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 406
#define _LOAD_ATTR_PROPERTY LOAD_ATTR_PROPERTY
-#define _LOAD_ATTR_SLOT 406
-#define _LOAD_ATTR_SLOT_0 407
-#define _LOAD_ATTR_SLOT_1 408
-#define _LOAD_ATTR_WITH_HINT 409
+#define _LOAD_ATTR_SLOT 407
+#define _LOAD_ATTR_SLOT_0 408
+#define _LOAD_ATTR_SLOT_1 409
+#define _LOAD_ATTR_WITH_HINT 410
#define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS
#define _LOAD_CONST LOAD_CONST
-#define _LOAD_CONST_INLINE 410
-#define _LOAD_CONST_INLINE_BORROW 411
-#define _LOAD_CONST_INLINE_BORROW_WITH_NULL 412
-#define _LOAD_CONST_INLINE_WITH_NULL 413
+#define _LOAD_CONST_INLINE 411
+#define _LOAD_CONST_INLINE_BORROW 412
+#define _LOAD_CONST_INLINE_BORROW_WITH_NULL 413
+#define _LOAD_CONST_INLINE_WITH_NULL 414
#define _LOAD_DEREF LOAD_DEREF
-#define _LOAD_FAST 414
-#define _LOAD_FAST_0 415
-#define _LOAD_FAST_1 416
-#define _LOAD_FAST_2 417
-#define _LOAD_FAST_3 418
-#define _LOAD_FAST_4 419
-#define _LOAD_FAST_5 420
-#define _LOAD_FAST_6 421
-#define _LOAD_FAST_7 422
+#define _LOAD_FAST 415
+#define _LOAD_FAST_0 416
+#define _LOAD_FAST_1 417
+#define _LOAD_FAST_2 418
+#define _LOAD_FAST_3 419
+#define _LOAD_FAST_4 420
+#define _LOAD_FAST_5 421
+#define _LOAD_FAST_6 422
+#define _LOAD_FAST_7 423
#define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR
#define _LOAD_FAST_CHECK LOAD_FAST_CHECK
#define _LOAD_FAST_LOAD_FAST LOAD_FAST_LOAD_FAST
#define _LOAD_FROM_DICT_OR_DEREF LOAD_FROM_DICT_OR_DEREF
#define _LOAD_FROM_DICT_OR_GLOBALS LOAD_FROM_DICT_OR_GLOBALS
-#define _LOAD_GLOBAL 423
-#define _LOAD_GLOBAL_BUILTINS 424
-#define _LOAD_GLOBAL_MODULE 425
+#define _LOAD_GLOBAL 424
+#define _LOAD_GLOBAL_BUILTINS 425
+#define _LOAD_GLOBAL_MODULE 426
#define _LOAD_LOCALS LOAD_LOCALS
#define _LOAD_NAME LOAD_NAME
#define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR
@@ -226,51 +227,51 @@ extern "C" {
#define _MATCH_SEQUENCE MATCH_SEQUENCE
#define _NOP NOP
#define _POP_EXCEPT POP_EXCEPT
-#define _POP_FRAME 426
-#define _POP_JUMP_IF_FALSE 427
-#define _POP_JUMP_IF_TRUE 428
+#define _POP_FRAME 427
+#define _POP_JUMP_IF_FALSE 428
+#define _POP_JUMP_IF_TRUE 429
#define _POP_TOP POP_TOP
-#define _POP_TOP_LOAD_CONST_INLINE_BORROW 429
+#define _POP_TOP_LOAD_CONST_INLINE_BORROW 430
#define _PUSH_EXC_INFO PUSH_EXC_INFO
-#define _PUSH_FRAME 430
+#define _PUSH_FRAME 431
#define _PUSH_NULL PUSH_NULL
-#define _PY_FRAME_GENERAL 431
-#define _REPLACE_WITH_TRUE 432
+#define _PY_FRAME_GENERAL 432
+#define _REPLACE_WITH_TRUE 433
#define _RESUME_CHECK RESUME_CHECK
#define _RETURN_GENERATOR RETURN_GENERATOR
-#define _SAVE_RETURN_OFFSET 433
-#define _SEND 434
+#define _SAVE_RETURN_OFFSET 434
+#define _SEND 435
#define _SEND_GEN SEND_GEN
#define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS
#define _SET_ADD SET_ADD
#define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE
#define _SET_UPDATE SET_UPDATE
-#define _START_EXECUTOR 435
-#define _STORE_ATTR 436
-#define _STORE_ATTR_INSTANCE_VALUE 437
-#define _STORE_ATTR_SLOT 438
+#define _START_EXECUTOR 436
+#define _STORE_ATTR 437
+#define _STORE_ATTR_INSTANCE_VALUE 438
+#define _STORE_ATTR_SLOT 439
#define _STORE_ATTR_WITH_HINT STORE_ATTR_WITH_HINT
#define _STORE_DEREF STORE_DEREF
-#define _STORE_FAST 439
-#define _STORE_FAST_0 440
-#define _STORE_FAST_1 441
-#define _STORE_FAST_2 442
-#define _STORE_FAST_3 443
-#define _STORE_FAST_4 444
-#define _STORE_FAST_5 445
-#define _STORE_FAST_6 446
-#define _STORE_FAST_7 447
+#define _STORE_FAST 440
+#define _STORE_FAST_0 441
+#define _STORE_FAST_1 442
+#define _STORE_FAST_2 443
+#define _STORE_FAST_3 444
+#define _STORE_FAST_4 445
+#define _STORE_FAST_5 446
+#define _STORE_FAST_6 447
+#define _STORE_FAST_7 448
#define _STORE_FAST_LOAD_FAST STORE_FAST_LOAD_FAST
#define _STORE_FAST_STORE_FAST STORE_FAST_STORE_FAST
#define _STORE_GLOBAL STORE_GLOBAL
#define _STORE_NAME STORE_NAME
#define _STORE_SLICE STORE_SLICE
-#define _STORE_SUBSCR 448
+#define _STORE_SUBSCR 449
#define _STORE_SUBSCR_DICT STORE_SUBSCR_DICT
#define _STORE_SUBSCR_LIST_INT STORE_SUBSCR_LIST_INT
#define _SWAP SWAP
-#define _TIER2_RESUME_CHECK 449
-#define _TO_BOOL 450
+#define _TIER2_RESUME_CHECK 450
+#define _TO_BOOL 451
#define _TO_BOOL_BOOL TO_BOOL_BOOL
#define _TO_BOOL_INT TO_BOOL_INT
#define _TO_BOOL_LIST TO_BOOL_LIST
@@ -280,13 +281,13 @@ extern "C" {
#define _UNARY_NEGATIVE UNARY_NEGATIVE
#define _UNARY_NOT UNARY_NOT
#define _UNPACK_EX UNPACK_EX
-#define _UNPACK_SEQUENCE 451
+#define _UNPACK_SEQUENCE 452
#define _UNPACK_SEQUENCE_LIST UNPACK_SEQUENCE_LIST
#define _UNPACK_SEQUENCE_TUPLE UNPACK_SEQUENCE_TUPLE
#define _UNPACK_SEQUENCE_TWO_TUPLE UNPACK_SEQUENCE_TWO_TUPLE
#define _WITH_EXCEPT_START WITH_EXCEPT_START
#define _YIELD_VALUE YIELD_VALUE
-#define MAX_UOP_ID 451
+#define MAX_UOP_ID 452
#ifdef __cplusplus
}
diff --git a/Include/internal/pycore_uop_metadata.h
b/Include/internal/pycore_uop_metadata.h
index 02ffc769c180ea..6c69c57b8df080 100644
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -203,6 +203,7 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_CHECK_PEP_523] = HAS_DEOPT_FLAG,
[_CHECK_FUNCTION_EXACT_ARGS] = HAS_ARG_FLAG | HAS_EXIT_FLAG,
[_CHECK_STACK_SPACE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG,
+ [_CHECK_RECURSION_REMAINING] = HAS_DEOPT_FLAG,
[_INIT_CALL_PY_EXACT_ARGS_0] = HAS_PURE_FLAG,
[_INIT_CALL_PY_EXACT_ARGS_1] = HAS_PURE_FLAG,
[_INIT_CALL_PY_EXACT_ARGS_2] = HAS_PURE_FLAG,
@@ -319,6 +320,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
[_CHECK_METHOD_VERSION] = "_CHECK_METHOD_VERSION",
[_CHECK_PEP_523] = "_CHECK_PEP_523",
[_CHECK_PERIODIC] = "_CHECK_PERIODIC",
+ [_CHECK_RECURSION_REMAINING] = "_CHECK_RECURSION_REMAINING",
[_CHECK_STACK_SPACE] = "_CHECK_STACK_SPACE",
[_CHECK_STACK_SPACE_OPERAND] = "_CHECK_STACK_SPACE_OPERAND",
[_CHECK_VALIDITY] = "_CHECK_VALIDITY",
@@ -880,6 +882,8 @@ int _PyUop_num_popped(int opcode, int oparg)
return 2 + oparg;
case _CHECK_STACK_SPACE:
return 2 + oparg;
+ case _CHECK_RECURSION_REMAINING:
+ return 0;
case _INIT_CALL_PY_EXACT_ARGS_0:
return 2 + oparg;
case _INIT_CALL_PY_EXACT_ARGS_1:
diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py
index aeb4de6caa527d..82d7c1ad25a46d 100644
--- a/Lib/test/test_opcache.py
+++ b/Lib/test/test_opcache.py
@@ -537,6 +537,13 @@ def count_args(self, *args):
MyClass.__init__.__code__ = count_args.__code__
instantiate()
+ def test_recursion_check_for_general_calls(self):
+ def test(default=None):
+ return test()
+
+ with self.assertRaises(RecursionError):
+ test()
+
@threading_helper.requires_working_threading()
@requires_specialization
diff --git a/Misc/NEWS.d/next/Core and
Builtins/2025-04-20-10-37-39.gh-issue-132744.ArrCp8.rst b/Misc/NEWS.d/next/Core
and Builtins/2025-04-20-10-37-39.gh-issue-132744.ArrCp8.rst
new file mode 100644
index 00000000000000..bcd72568c52727
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and
Builtins/2025-04-20-10-37-39.gh-issue-132744.ArrCp8.rst
@@ -0,0 +1 @@
+Certain calls now check for runaway recursion and respect the system recursion
limit.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 1da434bbbc892a..38d90b05a723a7 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -3205,6 +3205,7 @@ dummy_func(
unused/1 + // Skip over the counter
_CHECK_PEP_523 +
_CHECK_FUNCTION_VERSION +
+ _CHECK_RECURSION_REMAINING +
_PY_FRAME_GENERAL +
_SAVE_RETURN_OFFSET +
_PUSH_FRAME;
@@ -3234,6 +3235,7 @@ dummy_func(
_CHECK_PEP_523 +
_CHECK_METHOD_VERSION +
_EXPAND_METHOD +
+ _CHECK_RECURSION_REMAINING +
_PY_FRAME_GENERAL +
_SAVE_RETURN_OFFSET +
_PUSH_FRAME;
@@ -3302,6 +3304,9 @@ dummy_func(
PyFunctionObject *func = (PyFunctionObject *)callable;
PyCodeObject *code = (PyCodeObject *)func->func_code;
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate,
code->co_framesize));
+ }
+
+ op(_CHECK_RECURSION_REMAINING, (--)) {
DEOPT_IF(tstate->py_recursion_remaining <= 1);
}
@@ -3339,6 +3344,7 @@ dummy_func(
_INIT_CALL_BOUND_METHOD_EXACT_ARGS +
_CHECK_FUNCTION_EXACT_ARGS +
_CHECK_STACK_SPACE +
+ _CHECK_RECURSION_REMAINING +
_INIT_CALL_PY_EXACT_ARGS +
_SAVE_RETURN_OFFSET +
_PUSH_FRAME;
@@ -3348,6 +3354,7 @@ dummy_func(
_CHECK_PEP_523 +
_CHECK_FUNCTION_EXACT_ARGS +
_CHECK_STACK_SPACE +
+ _CHECK_RECURSION_REMAINING +
_INIT_CALL_PY_EXACT_ARGS +
_SAVE_RETURN_OFFSET +
_PUSH_FRAME;
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 1bfbeb675b1b6f..3920e0250c54fa 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -3233,6 +3233,10 @@
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
+ break;
+ }
+
+ case _CHECK_RECURSION_REMAINING: {
if (tstate->py_recursion_remaining <= 1) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index be00bf6eb6a39e..84ae5f7ac1e5c1 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -961,6 +961,9 @@
PyFunctionObject *func = (PyFunctionObject *)callable;
PyCodeObject *code = (PyCodeObject *)func->func_code;
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate,
code->co_framesize), CALL);
+ }
+ // _CHECK_RECURSION_REMAINING
+ {
DEOPT_IF(tstate->py_recursion_remaining <= 1, CALL);
}
// _INIT_CALL_PY_EXACT_ARGS
@@ -1044,6 +1047,10 @@
Py_INCREF(method);
Py_DECREF(callable);
}
+ // _CHECK_RECURSION_REMAINING
+ {
+ DEOPT_IF(tstate->py_recursion_remaining <= 1, CALL);
+ }
// _PY_FRAME_GENERAL
args = &stack_pointer[-oparg];
self_or_null = self;
@@ -1890,6 +1897,9 @@
PyFunctionObject *func = (PyFunctionObject *)callable;
PyCodeObject *code = (PyCodeObject *)func->func_code;
DEOPT_IF(!_PyThreadState_HasStackSpace(tstate,
code->co_framesize), CALL);
+ }
+ // _CHECK_RECURSION_REMAINING
+ {
DEOPT_IF(tstate->py_recursion_remaining <= 1, CALL);
}
// _INIT_CALL_PY_EXACT_ARGS
@@ -1955,6 +1965,10 @@
PyFunctionObject *func = (PyFunctionObject *)callable;
DEOPT_IF(func->func_version != func_version, CALL);
}
+ // _CHECK_RECURSION_REMAINING
+ {
+ DEOPT_IF(tstate->py_recursion_remaining <= 1, CALL);
+ }
// _PY_FRAME_GENERAL
args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index fb7f1edf498705..901ebc9ca16533 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -1660,6 +1660,10 @@
break;
}
+ case _CHECK_RECURSION_REMAINING: {
+ break;
+ }
+
case _INIT_CALL_PY_EXACT_ARGS: {
_Py_UopsSymbol **args;
_Py_UopsSymbol *self_or_null;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
