GH-131798: Split CALL_LEN into several uops (GH-133180)

diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
index fbb696e1755590858949531b3493643e3b6081e0..7c4b6c603741cb9344886ee27f88ad91f18ee988 100644 (file)
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -123,7 +123,7 @@ int _PyOpcode_num_popped(int opcode, int oparg)  {
         case CALL_KW_PY:
             return 3 + oparg;
         case CALL_LEN:
-            return 2 + oparg;
+            return 3;
         case CALL_LIST_APPEND:
             return 3;
         case CALL_METHOD_DESCRIPTOR_FAST:
@@ -1120,7 +1120,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = {
     [CALL_KW_BOUND_METHOD] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
     [CALL_KW_NON_PY] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
     [CALL_KW_PY] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
-    [CALL_LEN] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG },
+    [CALL_LEN] = { true, INSTR_FMT_IXC00, HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG },
     [CALL_LIST_APPEND] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
     [CALL_METHOD_DESCRIPTOR_FAST] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
     [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
@@ -1366,7 +1366,7 @@ _PyOpcode_macro_expansion[256] = {
     [CALL_KW_BOUND_METHOD] = { .nuops = 6, .uops = { { _CHECK_PEP_523, OPARG_SIMPLE, 1 }, { _CHECK_METHOD_VERSION_KW, 2, 1 }, { _EXPAND_METHOD_KW, OPARG_SIMPLE, 3 }, { _PY_FRAME_KW, OPARG_SIMPLE, 3 }, { _SAVE_RETURN_OFFSET, OPARG_SAVE_RETURN_OFFSET, 3 }, { _PUSH_FRAME, OPARG_SIMPLE, 3 } } },
     [CALL_KW_NON_PY] = { .nuops = 3, .uops = { { _CHECK_IS_NOT_PY_CALLABLE_KW, OPARG_SIMPLE, 3 }, { _CALL_KW_NON_PY, OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC, OPARG_SIMPLE, 3 } } },
     [CALL_KW_PY] = { .nuops = 5, .uops = { { _CHECK_PEP_523, OPARG_SIMPLE, 1 }, { _CHECK_FUNCTION_VERSION_KW, 2, 1 }, { _PY_FRAME_KW, OPARG_SIMPLE, 3 }, { _SAVE_RETURN_OFFSET, OPARG_SAVE_RETURN_OFFSET, 3 }, { _PUSH_FRAME, OPARG_SIMPLE, 3 } } },
-    [CALL_LEN] = { .nuops = 1, .uops = { { _CALL_LEN, OPARG_SIMPLE, 3 } } },
+    [CALL_LEN] = { .nuops = 3, .uops = { { _GUARD_NOS_NULL, OPARG_SIMPLE, 3 }, { _GUARD_CALLABLE_LEN, OPARG_SIMPLE, 3 }, { _CALL_LEN, OPARG_SIMPLE, 3 } } },
     [CALL_LIST_APPEND] = { .nuops = 1, .uops = { { _CALL_LIST_APPEND, OPARG_SIMPLE, 3 } } },
     [CALL_METHOD_DESCRIPTOR_FAST] = { .nuops = 2, .uops = { { _CALL_METHOD_DESCRIPTOR_FAST, OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC, OPARG_SIMPLE, 3 } } },
     [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = { .nuops = 2, .uops = { { _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS, OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC, OPARG_SIMPLE, 3 } } },

diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h
index b4eef763da34ed09e5a311b6b59cf66b6bd04e32..d3d2b716e2c9977feccf674c83114a35851d0761 100644 (file)
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -45,122 +45,123 @@ extern "C" {
 #define _CALL_INTRINSIC_2 CALL_INTRINSIC_2
 #define _CALL_ISINSTANCE CALL_ISINSTANCE
 #define _CALL_KW_NON_PY 324
-#define _CALL_LEN CALL_LEN
+#define _CALL_LEN 325
 #define _CALL_LIST_APPEND CALL_LIST_APPEND
-#define _CALL_METHOD_DESCRIPTOR_FAST 325
-#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 326
-#define _CALL_METHOD_DESCRIPTOR_NOARGS 327
-#define _CALL_METHOD_DESCRIPTOR_O 328
-#define _CALL_NON_PY_GENERAL 329
-#define _CALL_STR_1 330
-#define _CALL_TUPLE_1 331
-#define _CALL_TYPE_1 332
-#define _CHECK_AND_ALLOCATE_OBJECT 333
-#define _CHECK_ATTR_CLASS 334
-#define _CHECK_ATTR_METHOD_LAZY_DICT 335
-#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 336
+#define _CALL_METHOD_DESCRIPTOR_FAST 326
+#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 327
+#define _CALL_METHOD_DESCRIPTOR_NOARGS 328
+#define _CALL_METHOD_DESCRIPTOR_O 329
+#define _CALL_NON_PY_GENERAL 330
+#define _CALL_STR_1 331
+#define _CALL_TUPLE_1 332
+#define _CALL_TYPE_1 333
+#define _CHECK_AND_ALLOCATE_OBJECT 334
+#define _CHECK_ATTR_CLASS 335
+#define _CHECK_ATTR_METHOD_LAZY_DICT 336
+#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 337
 #define _CHECK_EG_MATCH CHECK_EG_MATCH
 #define _CHECK_EXC_MATCH CHECK_EXC_MATCH
-#define _CHECK_FUNCTION 337
-#define _CHECK_FUNCTION_EXACT_ARGS 338
-#define _CHECK_FUNCTION_VERSION 339
-#define _CHECK_FUNCTION_VERSION_INLINE 340
-#define _CHECK_FUNCTION_VERSION_KW 341
-#define _CHECK_IS_NOT_PY_CALLABLE 342
-#define _CHECK_IS_NOT_PY_CALLABLE_KW 343
-#define _CHECK_MANAGED_OBJECT_HAS_VALUES 344
-#define _CHECK_METHOD_VERSION 345
-#define _CHECK_METHOD_VERSION_KW 346
-#define _CHECK_PEP_523 347
-#define _CHECK_PERIODIC 348
-#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 349
-#define _CHECK_RECURSION_REMAINING 350
-#define _CHECK_STACK_SPACE 351
-#define _CHECK_STACK_SPACE_OPERAND 352
-#define _CHECK_VALIDITY 353
-#define _COMPARE_OP 354
-#define _COMPARE_OP_FLOAT 355
-#define _COMPARE_OP_INT 356
-#define _COMPARE_OP_STR 357
-#define _CONTAINS_OP 358
-#define _CONTAINS_OP_DICT 359
-#define _CONTAINS_OP_SET 360
+#define _CHECK_FUNCTION 338
+#define _CHECK_FUNCTION_EXACT_ARGS 339
+#define _CHECK_FUNCTION_VERSION 340
+#define _CHECK_FUNCTION_VERSION_INLINE 341
+#define _CHECK_FUNCTION_VERSION_KW 342
+#define _CHECK_IS_NOT_PY_CALLABLE 343
+#define _CHECK_IS_NOT_PY_CALLABLE_KW 344
+#define _CHECK_MANAGED_OBJECT_HAS_VALUES 345
+#define _CHECK_METHOD_VERSION 346
+#define _CHECK_METHOD_VERSION_KW 347
+#define _CHECK_PEP_523 348
+#define _CHECK_PERIODIC 349
+#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 350
+#define _CHECK_RECURSION_REMAINING 351
+#define _CHECK_STACK_SPACE 352
+#define _CHECK_STACK_SPACE_OPERAND 353
+#define _CHECK_VALIDITY 354
+#define _COMPARE_OP 355
+#define _COMPARE_OP_FLOAT 356
+#define _COMPARE_OP_INT 357
+#define _COMPARE_OP_STR 358
+#define _CONTAINS_OP 359
+#define _CONTAINS_OP_DICT 360
+#define _CONTAINS_OP_SET 361
 #define _CONVERT_VALUE CONVERT_VALUE
 #define _COPY COPY
 #define _COPY_FREE_VARS COPY_FREE_VARS
-#define _CREATE_INIT_FRAME 361
+#define _CREATE_INIT_FRAME 362
 #define _DELETE_ATTR DELETE_ATTR
 #define _DELETE_DEREF DELETE_DEREF
 #define _DELETE_FAST DELETE_FAST
 #define _DELETE_GLOBAL DELETE_GLOBAL
 #define _DELETE_NAME DELETE_NAME
 #define _DELETE_SUBSCR DELETE_SUBSCR
-#define _DEOPT 362
+#define _DEOPT 363
 #define _DICT_MERGE DICT_MERGE
 #define _DICT_UPDATE DICT_UPDATE
-#define _DO_CALL 363
-#define _DO_CALL_FUNCTION_EX 364
-#define _DO_CALL_KW 365
+#define _DO_CALL 364
+#define _DO_CALL_FUNCTION_EX 365
+#define _DO_CALL_KW 366
 #define _END_FOR END_FOR
 #define _END_SEND END_SEND
-#define _ERROR_POP_N 366
+#define _ERROR_POP_N 367
 #define _EXIT_INIT_CHECK EXIT_INIT_CHECK
-#define _EXPAND_METHOD 367
-#define _EXPAND_METHOD_KW 368
-#define _FATAL_ERROR 369
+#define _EXPAND_METHOD 368
+#define _EXPAND_METHOD_KW 369
+#define _FATAL_ERROR 370
 #define _FORMAT_SIMPLE FORMAT_SIMPLE
 #define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC
-#define _FOR_ITER 370
-#define _FOR_ITER_GEN_FRAME 371
-#define _FOR_ITER_TIER_TWO 372
+#define _FOR_ITER 371
+#define _FOR_ITER_GEN_FRAME 372
+#define _FOR_ITER_TIER_TWO 373
 #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_BINARY_OP_EXTEND 373
-#define _GUARD_CALLABLE_STR_1 374
-#define _GUARD_CALLABLE_TUPLE_1 375
-#define _GUARD_CALLABLE_TYPE_1 376
-#define _GUARD_DORV_NO_DICT 377
-#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 378
-#define _GUARD_GLOBALS_VERSION 379
-#define _GUARD_IS_FALSE_POP 380
-#define _GUARD_IS_NONE_POP 381
-#define _GUARD_IS_NOT_NONE_POP 382
-#define _GUARD_IS_TRUE_POP 383
-#define _GUARD_KEYS_VERSION 384
-#define _GUARD_NOS_DICT 385
-#define _GUARD_NOS_FLOAT 386
-#define _GUARD_NOS_INT 387
-#define _GUARD_NOS_LIST 388
-#define _GUARD_NOS_NULL 389
-#define _GUARD_NOS_TUPLE 390
-#define _GUARD_NOS_UNICODE 391
-#define _GUARD_NOT_EXHAUSTED_LIST 392
-#define _GUARD_NOT_EXHAUSTED_RANGE 393
-#define _GUARD_NOT_EXHAUSTED_TUPLE 394
-#define _GUARD_TOS_ANY_SET 395
-#define _GUARD_TOS_DICT 396
-#define _GUARD_TOS_FLOAT 397
-#define _GUARD_TOS_INT 398
-#define _GUARD_TOS_LIST 399
-#define _GUARD_TOS_SLICE 400
-#define _GUARD_TOS_TUPLE 401
-#define _GUARD_TOS_UNICODE 402
-#define _GUARD_TYPE_VERSION 403
-#define _GUARD_TYPE_VERSION_AND_LOCK 404
+#define _GUARD_BINARY_OP_EXTEND 374
+#define _GUARD_CALLABLE_LEN 375
+#define _GUARD_CALLABLE_STR_1 376
+#define _GUARD_CALLABLE_TUPLE_1 377
+#define _GUARD_CALLABLE_TYPE_1 378
+#define _GUARD_DORV_NO_DICT 379
+#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 380
+#define _GUARD_GLOBALS_VERSION 381
+#define _GUARD_IS_FALSE_POP 382
+#define _GUARD_IS_NONE_POP 383
+#define _GUARD_IS_NOT_NONE_POP 384
+#define _GUARD_IS_TRUE_POP 385
+#define _GUARD_KEYS_VERSION 386
+#define _GUARD_NOS_DICT 387
+#define _GUARD_NOS_FLOAT 388
+#define _GUARD_NOS_INT 389
+#define _GUARD_NOS_LIST 390
+#define _GUARD_NOS_NULL 391
+#define _GUARD_NOS_TUPLE 392
+#define _GUARD_NOS_UNICODE 393
+#define _GUARD_NOT_EXHAUSTED_LIST 394
+#define _GUARD_NOT_EXHAUSTED_RANGE 395
+#define _GUARD_NOT_EXHAUSTED_TUPLE 396
+#define _GUARD_TOS_ANY_SET 397
+#define _GUARD_TOS_DICT 398
+#define _GUARD_TOS_FLOAT 399
+#define _GUARD_TOS_INT 400
+#define _GUARD_TOS_LIST 401
+#define _GUARD_TOS_SLICE 402
+#define _GUARD_TOS_TUPLE 403
+#define _GUARD_TOS_UNICODE 404
+#define _GUARD_TYPE_VERSION 405
+#define _GUARD_TYPE_VERSION_AND_LOCK 406
 #define _IMPORT_FROM IMPORT_FROM
 #define _IMPORT_NAME IMPORT_NAME
-#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 405
-#define _INIT_CALL_PY_EXACT_ARGS 406
-#define _INIT_CALL_PY_EXACT_ARGS_0 407
-#define _INIT_CALL_PY_EXACT_ARGS_1 408
-#define _INIT_CALL_PY_EXACT_ARGS_2 409
-#define _INIT_CALL_PY_EXACT_ARGS_3 410
-#define _INIT_CALL_PY_EXACT_ARGS_4 411
-#define _INSERT_NULL 412
+#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 407
+#define _INIT_CALL_PY_EXACT_ARGS 408
+#define _INIT_CALL_PY_EXACT_ARGS_0 409
+#define _INIT_CALL_PY_EXACT_ARGS_1 410
+#define _INIT_CALL_PY_EXACT_ARGS_2 411
+#define _INIT_CALL_PY_EXACT_ARGS_3 412
+#define _INIT_CALL_PY_EXACT_ARGS_4 413
+#define _INSERT_NULL 414
 #define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER
 #define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION
 #define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD
@@ -170,163 +171,163 @@ extern "C" {
 #define _INSTRUMENTED_POP_JUMP_IF_NONE INSTRUMENTED_POP_JUMP_IF_NONE
 #define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE INSTRUMENTED_POP_JUMP_IF_NOT_NONE
 #define _INSTRUMENTED_POP_JUMP_IF_TRUE INSTRUMENTED_POP_JUMP_IF_TRUE
-#define _IS_NONE 413
+#define _IS_NONE 415
 #define _IS_OP IS_OP
-#define _ITER_CHECK_LIST 414
-#define _ITER_CHECK_RANGE 415
-#define _ITER_CHECK_TUPLE 416
-#define _ITER_JUMP_LIST 417
-#define _ITER_JUMP_RANGE 418
-#define _ITER_JUMP_TUPLE 419
-#define _ITER_NEXT_LIST 420
-#define _ITER_NEXT_LIST_TIER_TWO 421
-#define _ITER_NEXT_RANGE 422
-#define _ITER_NEXT_TUPLE 423
-#define _JUMP_TO_TOP 424
+#define _ITER_CHECK_LIST 416
+#define _ITER_CHECK_RANGE 417
+#define _ITER_CHECK_TUPLE 418
+#define _ITER_JUMP_LIST 419
+#define _ITER_JUMP_RANGE 420
+#define _ITER_JUMP_TUPLE 421
+#define _ITER_NEXT_LIST 422
+#define _ITER_NEXT_LIST_TIER_TWO 423
+#define _ITER_NEXT_RANGE 424
+#define _ITER_NEXT_TUPLE 425
+#define _JUMP_TO_TOP 426
 #define _LIST_APPEND LIST_APPEND
 #define _LIST_EXTEND LIST_EXTEND
-#define _LOAD_ATTR 425
-#define _LOAD_ATTR_CLASS 426
+#define _LOAD_ATTR 427
+#define _LOAD_ATTR_CLASS 428
 #define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN
-#define _LOAD_ATTR_INSTANCE_VALUE 427
-#define _LOAD_ATTR_METHOD_LAZY_DICT 428
-#define _LOAD_ATTR_METHOD_NO_DICT 429
-#define _LOAD_ATTR_METHOD_WITH_VALUES 430
-#define _LOAD_ATTR_MODULE 431
-#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 432
-#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 433
-#define _LOAD_ATTR_PROPERTY_FRAME 434
-#define _LOAD_ATTR_SLOT 435
-#define _LOAD_ATTR_WITH_HINT 436
+#define _LOAD_ATTR_INSTANCE_VALUE 429
+#define _LOAD_ATTR_METHOD_LAZY_DICT 430
+#define _LOAD_ATTR_METHOD_NO_DICT 431
+#define _LOAD_ATTR_METHOD_WITH_VALUES 432
+#define _LOAD_ATTR_MODULE 433
+#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 434
+#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 435
+#define _LOAD_ATTR_PROPERTY_FRAME 436
+#define _LOAD_ATTR_SLOT 437
+#define _LOAD_ATTR_WITH_HINT 438
 #define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS
-#define _LOAD_BYTECODE 437
+#define _LOAD_BYTECODE 439
 #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT
 #define _LOAD_CONST LOAD_CONST
 #define _LOAD_CONST_IMMORTAL LOAD_CONST_IMMORTAL
-#define _LOAD_CONST_INLINE 438
-#define _LOAD_CONST_INLINE_BORROW 439
+#define _LOAD_CONST_INLINE 440
+#define _LOAD_CONST_INLINE_BORROW 441
 #define _LOAD_CONST_MORTAL LOAD_CONST_MORTAL
 #define _LOAD_DEREF LOAD_DEREF
-#define _LOAD_FAST 440
-#define _LOAD_FAST_0 441
-#define _LOAD_FAST_1 442
-#define _LOAD_FAST_2 443
-#define _LOAD_FAST_3 444
-#define _LOAD_FAST_4 445
-#define _LOAD_FAST_5 446
-#define _LOAD_FAST_6 447
-#define _LOAD_FAST_7 448
+#define _LOAD_FAST 442
+#define _LOAD_FAST_0 443
+#define _LOAD_FAST_1 444
+#define _LOAD_FAST_2 445
+#define _LOAD_FAST_3 446
+#define _LOAD_FAST_4 447
+#define _LOAD_FAST_5 448
+#define _LOAD_FAST_6 449
+#define _LOAD_FAST_7 450
 #define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR
-#define _LOAD_FAST_BORROW 449
-#define _LOAD_FAST_BORROW_0 450
-#define _LOAD_FAST_BORROW_1 451
-#define _LOAD_FAST_BORROW_2 452
-#define _LOAD_FAST_BORROW_3 453
-#define _LOAD_FAST_BORROW_4 454
-#define _LOAD_FAST_BORROW_5 455
-#define _LOAD_FAST_BORROW_6 456
-#define _LOAD_FAST_BORROW_7 457
+#define _LOAD_FAST_BORROW 451
+#define _LOAD_FAST_BORROW_0 452
+#define _LOAD_FAST_BORROW_1 453
+#define _LOAD_FAST_BORROW_2 454
+#define _LOAD_FAST_BORROW_3 455
+#define _LOAD_FAST_BORROW_4 456
+#define _LOAD_FAST_BORROW_5 457
+#define _LOAD_FAST_BORROW_6 458
+#define _LOAD_FAST_BORROW_7 459
 #define _LOAD_FAST_BORROW_LOAD_FAST_BORROW LOAD_FAST_BORROW_LOAD_FAST_BORROW
 #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 458
-#define _LOAD_GLOBAL_BUILTINS 459
-#define _LOAD_GLOBAL_MODULE 460
+#define _LOAD_GLOBAL 460
+#define _LOAD_GLOBAL_BUILTINS 461
+#define _LOAD_GLOBAL_MODULE 462
 #define _LOAD_LOCALS LOAD_LOCALS
 #define _LOAD_NAME LOAD_NAME
-#define _LOAD_SMALL_INT 461
-#define _LOAD_SMALL_INT_0 462
-#define _LOAD_SMALL_INT_1 463
-#define _LOAD_SMALL_INT_2 464
-#define _LOAD_SMALL_INT_3 465
-#define _LOAD_SPECIAL 466
+#define _LOAD_SMALL_INT 463
+#define _LOAD_SMALL_INT_0 464
+#define _LOAD_SMALL_INT_1 465
+#define _LOAD_SMALL_INT_2 466
+#define _LOAD_SMALL_INT_3 467
+#define _LOAD_SPECIAL 468
 #define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR
 #define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD
-#define _MAKE_CALLARGS_A_TUPLE 467
+#define _MAKE_CALLARGS_A_TUPLE 469
 #define _MAKE_CELL MAKE_CELL
 #define _MAKE_FUNCTION MAKE_FUNCTION
-#define _MAKE_WARM 468
+#define _MAKE_WARM 470
 #define _MAP_ADD MAP_ADD
 #define _MATCH_CLASS MATCH_CLASS
 #define _MATCH_KEYS MATCH_KEYS
 #define _MATCH_MAPPING MATCH_MAPPING
 #define _MATCH_SEQUENCE MATCH_SEQUENCE
-#define _MAYBE_EXPAND_METHOD 469
-#define _MAYBE_EXPAND_METHOD_KW 470
-#define _MONITOR_CALL 471
-#define _MONITOR_CALL_KW 472
-#define _MONITOR_JUMP_BACKWARD 473
-#define _MONITOR_RESUME 474
+#define _MAYBE_EXPAND_METHOD 471
+#define _MAYBE_EXPAND_METHOD_KW 472
+#define _MONITOR_CALL 473
+#define _MONITOR_CALL_KW 474
+#define _MONITOR_JUMP_BACKWARD 475
+#define _MONITOR_RESUME 476
 #define _NOP NOP
 #define _POP_EXCEPT POP_EXCEPT
-#define _POP_JUMP_IF_FALSE 475
-#define _POP_JUMP_IF_TRUE 476
+#define _POP_JUMP_IF_FALSE 477
+#define _POP_JUMP_IF_TRUE 478
 #define _POP_TOP POP_TOP
-#define _POP_TOP_LOAD_CONST_INLINE 477
-#define _POP_TOP_LOAD_CONST_INLINE_BORROW 478
-#define _POP_TWO_LOAD_CONST_INLINE_BORROW 479
+#define _POP_TOP_LOAD_CONST_INLINE 479
+#define _POP_TOP_LOAD_CONST_INLINE_BORROW 480
+#define _POP_TWO_LOAD_CONST_INLINE_BORROW 481
 #define _PUSH_EXC_INFO PUSH_EXC_INFO
-#define _PUSH_FRAME 480
+#define _PUSH_FRAME 482
 #define _PUSH_NULL PUSH_NULL
-#define _PUSH_NULL_CONDITIONAL 481
-#define _PY_FRAME_GENERAL 482
-#define _PY_FRAME_KW 483
-#define _QUICKEN_RESUME 484
-#define _REPLACE_WITH_TRUE 485
+#define _PUSH_NULL_CONDITIONAL 483
+#define _PY_FRAME_GENERAL 484
+#define _PY_FRAME_KW 485
+#define _QUICKEN_RESUME 486
+#define _REPLACE_WITH_TRUE 487
 #define _RESUME_CHECK RESUME_CHECK
 #define _RETURN_GENERATOR RETURN_GENERATOR
 #define _RETURN_VALUE RETURN_VALUE
-#define _SAVE_RETURN_OFFSET 486
-#define _SEND 487
-#define _SEND_GEN_FRAME 488
+#define _SAVE_RETURN_OFFSET 488
+#define _SEND 489
+#define _SEND_GEN_FRAME 490
 #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 489
-#define _STORE_ATTR 490
-#define _STORE_ATTR_INSTANCE_VALUE 491
-#define _STORE_ATTR_SLOT 492
-#define _STORE_ATTR_WITH_HINT 493
+#define _START_EXECUTOR 491
+#define _STORE_ATTR 492
+#define _STORE_ATTR_INSTANCE_VALUE 493
+#define _STORE_ATTR_SLOT 494
+#define _STORE_ATTR_WITH_HINT 495
 #define _STORE_DEREF STORE_DEREF
-#define _STORE_FAST 494
-#define _STORE_FAST_0 495
-#define _STORE_FAST_1 496
-#define _STORE_FAST_2 497
-#define _STORE_FAST_3 498
-#define _STORE_FAST_4 499
-#define _STORE_FAST_5 500
-#define _STORE_FAST_6 501
-#define _STORE_FAST_7 502
+#define _STORE_FAST 496
+#define _STORE_FAST_0 497
+#define _STORE_FAST_1 498
+#define _STORE_FAST_2 499
+#define _STORE_FAST_3 500
+#define _STORE_FAST_4 501
+#define _STORE_FAST_5 502
+#define _STORE_FAST_6 503
+#define _STORE_FAST_7 504
 #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 503
-#define _STORE_SUBSCR 504
-#define _STORE_SUBSCR_DICT 505
-#define _STORE_SUBSCR_LIST_INT 506
+#define _STORE_SLICE 505
+#define _STORE_SUBSCR 506
+#define _STORE_SUBSCR_DICT 507
+#define _STORE_SUBSCR_LIST_INT 508
 #define _SWAP SWAP
-#define _TIER2_RESUME_CHECK 507
-#define _TO_BOOL 508
+#define _TIER2_RESUME_CHECK 509
+#define _TO_BOOL 510
 #define _TO_BOOL_BOOL TO_BOOL_BOOL
 #define _TO_BOOL_INT TO_BOOL_INT
-#define _TO_BOOL_LIST 509
+#define _TO_BOOL_LIST 511
 #define _TO_BOOL_NONE TO_BOOL_NONE
-#define _TO_BOOL_STR 510
+#define _TO_BOOL_STR 512
 #define _UNARY_INVERT UNARY_INVERT
 #define _UNARY_NEGATIVE UNARY_NEGATIVE
 #define _UNARY_NOT UNARY_NOT
 #define _UNPACK_EX UNPACK_EX
-#define _UNPACK_SEQUENCE 511
-#define _UNPACK_SEQUENCE_LIST 512
-#define _UNPACK_SEQUENCE_TUPLE 513
-#define _UNPACK_SEQUENCE_TWO_TUPLE 514
+#define _UNPACK_SEQUENCE 513
+#define _UNPACK_SEQUENCE_LIST 514
+#define _UNPACK_SEQUENCE_TUPLE 515
+#define _UNPACK_SEQUENCE_TWO_TUPLE 516
 #define _WITH_EXCEPT_START WITH_EXCEPT_START
 #define _YIELD_VALUE YIELD_VALUE
-#define MAX_UOP_ID 514
+#define MAX_UOP_ID 516
 
 #ifdef __cplusplus
 }

diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
index 922d8a6cadf08cc7dac1191d2af2f7bfe4e54cb2..a7e145381648ab2a304eb99014694c922b213ac7 100644 (file)
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -259,7 +259,8 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
     [_CALL_BUILTIN_O] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
     [_CALL_BUILTIN_FAST] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
     [_CALL_BUILTIN_FAST_WITH_KEYWORDS] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
-    [_CALL_LEN] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG,
+    [_GUARD_CALLABLE_LEN] = HAS_DEOPT_FLAG,
+    [_CALL_LEN] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG,
     [_CALL_ISINSTANCE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG,
     [_CALL_LIST_APPEND] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
     [_CALL_METHOD_DESCRIPTOR_O] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
@@ -422,6 +423,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
     [_GET_ITER] = "_GET_ITER",
     [_GET_LEN] = "_GET_LEN",
     [_GET_YIELD_FROM_ITER] = "_GET_YIELD_FROM_ITER",
+    [_GUARD_CALLABLE_LEN] = "_GUARD_CALLABLE_LEN",
     [_GUARD_CALLABLE_STR_1] = "_GUARD_CALLABLE_STR_1",
     [_GUARD_CALLABLE_TUPLE_1] = "_GUARD_CALLABLE_TUPLE_1",
     [_GUARD_CALLABLE_TYPE_1] = "_GUARD_CALLABLE_TYPE_1",
@@ -1088,8 +1090,10 @@ int _PyUop_num_popped(int opcode, int oparg)
             return 2 + oparg;
         case _CALL_BUILTIN_FAST_WITH_KEYWORDS:
             return 2 + oparg;
+        case _GUARD_CALLABLE_LEN:
+            return 0;
         case _CALL_LEN:
-            return 2 + oparg;
+            return 3;
         case _CALL_ISINSTANCE:
             return 2 + oparg;
         case _CALL_LIST_APPEND:

diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
index 7e0c60d55224021017f281bfa330122bfa9a0eb3..ba7bcb4540a45174466a8378c40d6d129eee2558 100644 (file)
--- a/Lib/test/test_capi/test_opt.py
+++ b/Lib/test/test_capi/test_opt.py
@@ -1919,9 +1919,11 @@ class TestUopsOptimization(unittest.TestCase):
 
         _, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
         uops = get_opnames(ex)
+        self.assertNotIn("_GUARD_NOS_NULL", uops)
+        self.assertNotIn("_GUARD_CALLABLE_LEN", uops)
+        self.assertIn("_CALL_LEN", uops)
         self.assertNotIn("_GUARD_NOS_INT", uops)
         self.assertNotIn("_GUARD_TOS_INT", uops)
-        self.assertIn("_CALL_LEN", uops)
 
     def test_binary_op_subscr_tuple_int(self):
         def testfunc(n):

diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-04-30-00-21-54.gh-issue-131798.D6T5_u.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-30-00-21-54.gh-issue-131798.D6T5_u.rst
new file mode 100644 (file)
index 0000000..d94d04c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-30-00-21-54.gh-issue-131798.D6T5_u.rst
@@ -0,0 +1 @@
+Split ``CALL_LEN`` into several uops allowing the JIT to remove them when optimizing. Patch by Diego Russo.

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index cc47e57175d7273299a20e297ce3ab62fea7d798..90234b2d5bdb0ebed8e71a22ff967bcff3641b2e 100644 (file)
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -4337,22 +4337,25 @@ dummy_func(
             _CALL_BUILTIN_FAST_WITH_KEYWORDS +
             _CHECK_PERIODIC;
 
-        inst(CALL_LEN, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
-            /* len(o) */
-            PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
+        macro(CALL_LEN) =
+            unused/1 +
+            unused/2 +
+            _GUARD_NOS_NULL +
+            _GUARD_CALLABLE_LEN +
+            _CALL_LEN;
 
-            int total_args = oparg;
-            if (!PyStackRef_IsNull(self_or_null)) {
-                args--;
-                total_args++;
-            }
-            DEOPT_IF(total_args != 1);
+        op(_GUARD_CALLABLE_LEN, (callable, unused, unused -- callable, unused, unused)){
+            PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
             PyInterpreterState *interp = tstate->interp;
             DEOPT_IF(callable_o != interp->callable_cache.len);
+        }
+
+        op(_CALL_LEN, (callable, null, arg -- res)) {
+            /* len(o) */
+            (void)null;
             STAT_INC(CALL, hit);
-            _PyStackRef arg_stackref = args[0];
-            PyObject *arg = PyStackRef_AsPyObjectBorrow(arg_stackref);
-            Py_ssize_t len_i = PyObject_Length(arg);
+            PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);
+            Py_ssize_t len_i = PyObject_Length(arg_o);
             if (len_i < 0) {
                 ERROR_NO_POP();
             }
@@ -4361,9 +4364,8 @@ dummy_func(
             if (res_o == NULL) {
                 ERROR_NO_POP();
             }
-            PyStackRef_CLOSE(arg_stackref);
-            DEAD(args);
-            DEAD(self_or_null);
+            PyStackRef_CLOSE(arg);
+            DEAD(null);
             PyStackRef_CLOSE(callable);
             res = PyStackRef_FromPyObjectSteal(res_o);
         }

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 662e050c5c478aad47269000dbb43af6cb324bcf..c1829717e49274028b3881de8ac9983ce3993870 100644 (file)
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -5788,35 +5788,31 @@
             break;
         }
 
-        case _CALL_LEN: {
-            _PyStackRef *args;
-            _PyStackRef self_or_null;
+        case _GUARD_CALLABLE_LEN: {
             _PyStackRef callable;
-            _PyStackRef res;
-            oparg = CURRENT_OPARG();
-            args = &stack_pointer[-oparg];
-            self_or_null = stack_pointer[-1 - oparg];
-            callable = stack_pointer[-2 - oparg];
+            callable = stack_pointer[-3];
             PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
-            int total_args = oparg;
-            if (!PyStackRef_IsNull(self_or_null)) {
-                args--;
-                total_args++;
-            }
-            if (total_args != 1) {
-                UOP_STAT_INC(uopcode, miss);
-                JUMP_TO_JUMP_TARGET();
-            }
             PyInterpreterState *interp = tstate->interp;
             if (callable_o != interp->callable_cache.len) {
                 UOP_STAT_INC(uopcode, miss);
                 JUMP_TO_JUMP_TARGET();
             }
+            break;
+        }
+
+        case _CALL_LEN: {
+            _PyStackRef arg;
+            _PyStackRef null;
+            _PyStackRef callable;
+            _PyStackRef res;
+            arg = stack_pointer[-1];
+            null = stack_pointer[-2];
+            callable = stack_pointer[-3];
+            (void)null;
             STAT_INC(CALL, hit);
-            _PyStackRef arg_stackref = args[0];
-            PyObject *arg = PyStackRef_AsPyObjectBorrow(arg_stackref);
+            PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);
             _PyFrame_SetStackPointer(frame, stack_pointer);
-            Py_ssize_t len_i = PyObject_Length(arg);
+            Py_ssize_t len_i = PyObject_Length(arg_o);
             stack_pointer = _PyFrame_GetStackPointer(frame);
             if (len_i < 0) {
                 JUMP_TO_ERROR();
@@ -5826,10 +5822,12 @@
             if (res_o == NULL) {
                 JUMP_TO_ERROR();
             }
+            stack_pointer += -1;
+            assert(WITHIN_STACK_BOUNDS());
             _PyFrame_SetStackPointer(frame, stack_pointer);
-            PyStackRef_CLOSE(arg_stackref);
+            PyStackRef_CLOSE(arg);
             stack_pointer = _PyFrame_GetStackPointer(frame);
-            stack_pointer += -2 - oparg;
+            stack_pointer += -2;
             assert(WITHIN_STACK_BOUNDS());
             _PyFrame_SetStackPointer(frame, stack_pointer);
             PyStackRef_CLOSE(callable);

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 072951d2a5fcf6d585d9cd6548229c4ba8f06ed3..ca077dabad762b7048e8c1415f2c64b7bf492f54 100644 (file)
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -3414,55 +3414,61 @@
             next_instr += 4;
             INSTRUCTION_STATS(CALL_LEN);
             static_assert(INLINE_CACHE_ENTRIES_CALL == 3, "incorrect cache size");
+            _PyStackRef null;
             _PyStackRef callable;
-            _PyStackRef self_or_null;
-            _PyStackRef *args;
+            _PyStackRef arg;
             _PyStackRef res;
             /* Skip 1 cache entry */
             /* Skip 2 cache entries */
-            args = &stack_pointer[-oparg];
-            self_or_null = stack_pointer[-1 - oparg];
-            callable = stack_pointer[-2 - oparg];
-            PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
-            int total_args = oparg;
-            if (!PyStackRef_IsNull(self_or_null)) {
-                args--;
-                total_args++;
-            }
-            if (total_args != 1) {
-                UPDATE_MISS_STATS(CALL);
-                assert(_PyOpcode_Deopt[opcode] == (CALL));
-                JUMP_TO_PREDICTED(CALL);
-            }
-            PyInterpreterState *interp = tstate->interp;
-            if (callable_o != interp->callable_cache.len) {
-                UPDATE_MISS_STATS(CALL);
-                assert(_PyOpcode_Deopt[opcode] == (CALL));
-                JUMP_TO_PREDICTED(CALL);
+            // _GUARD_NOS_NULL
+            {
+                null = stack_pointer[-2];
+                if (!PyStackRef_IsNull(null)) {
+                    UPDATE_MISS_STATS(CALL);
+                    assert(_PyOpcode_Deopt[opcode] == (CALL));
+                    JUMP_TO_PREDICTED(CALL);
+                }
             }
-            STAT_INC(CALL, hit);
-            _PyStackRef arg_stackref = args[0];
-            PyObject *arg = PyStackRef_AsPyObjectBorrow(arg_stackref);
-            _PyFrame_SetStackPointer(frame, stack_pointer);
-            Py_ssize_t len_i = PyObject_Length(arg);
-            stack_pointer = _PyFrame_GetStackPointer(frame);
-            if (len_i < 0) {
-                JUMP_TO_LABEL(error);
+            // _GUARD_CALLABLE_LEN
+            {
+                callable = stack_pointer[-3];
+                PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
+                PyInterpreterState *interp = tstate->interp;
+                if (callable_o != interp->callable_cache.len) {
+                    UPDATE_MISS_STATS(CALL);
+                    assert(_PyOpcode_Deopt[opcode] == (CALL));
+                    JUMP_TO_PREDICTED(CALL);
+                }
             }
-            PyObject *res_o = PyLong_FromSsize_t(len_i);
-            assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
-            if (res_o == NULL) {
-                JUMP_TO_LABEL(error);
+            // _CALL_LEN
+            {
+                arg = stack_pointer[-1];
+                (void)null;
+                STAT_INC(CALL, hit);
+                PyObject *arg_o = PyStackRef_AsPyObjectBorrow(arg);
+                _PyFrame_SetStackPointer(frame, stack_pointer);
+                Py_ssize_t len_i = PyObject_Length(arg_o);
+                stack_pointer = _PyFrame_GetStackPointer(frame);
+                if (len_i < 0) {
+                    JUMP_TO_LABEL(error);
+                }
+                PyObject *res_o = PyLong_FromSsize_t(len_i);
+                assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
+                if (res_o == NULL) {
+                    JUMP_TO_LABEL(error);
+                }
+                stack_pointer += -1;
+                assert(WITHIN_STACK_BOUNDS());
+                _PyFrame_SetStackPointer(frame, stack_pointer);
+                PyStackRef_CLOSE(arg);
+                stack_pointer = _PyFrame_GetStackPointer(frame);
+                stack_pointer += -2;
+                assert(WITHIN_STACK_BOUNDS());
+                _PyFrame_SetStackPointer(frame, stack_pointer);
+                PyStackRef_CLOSE(callable);
+                stack_pointer = _PyFrame_GetStackPointer(frame);
+                res = PyStackRef_FromPyObjectSteal(res_o);
             }
-            _PyFrame_SetStackPointer(frame, stack_pointer);
-            PyStackRef_CLOSE(arg_stackref);
-            stack_pointer = _PyFrame_GetStackPointer(frame);
-            stack_pointer += -2 - oparg;
-            assert(WITHIN_STACK_BOUNDS());
-            _PyFrame_SetStackPointer(frame, stack_pointer);
-            PyStackRef_CLOSE(callable);
-            stack_pointer = _PyFrame_GetStackPointer(frame);
-            res = PyStackRef_FromPyObjectSteal(res_o);
             stack_pointer[0] = res;
             stack_pointer += 1;
             assert(WITHIN_STACK_BOUNDS());

diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index 567caad22554ead6a34f4bc6a944958ee2b39a1c..e99421a3aff4baab398537b361c8f6b186af5830 100644 (file)
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -1084,10 +1084,18 @@ dummy_func(void) {
         sym_set_const(callable, (PyObject *)&PyUnicode_Type);
     }
 
-    op(_CALL_LEN, (callable[1], self_or_null[1], args[oparg] -- res)) {
+    op(_CALL_LEN, (unused, unused, unused -- res)) {
         res = sym_new_type(ctx, &PyLong_Type);
     }
 
+    op(_GUARD_CALLABLE_LEN, (callable, unused, unused -- callable, unused, unused)) {
+        PyObject *len = _PyInterpreterState_GET()->callable_cache.len;
+        if (sym_get_const(ctx, callable) == len) {
+            REPLACE_OP(this_instr, _NOP, 0, 0);
+        }
+        sym_set_const(callable, len);
+    }
+
 // END BYTECODES //
 
 }

diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index 8e8b2ecfa5b0cf047082149ed1046c5dd6921d9d..a9bb67d960538f940e0d481eaaf5dc12c1bf1c7a 100644 (file)
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -2065,11 +2065,22 @@
             break;
         }
 
+        case _GUARD_CALLABLE_LEN: {
+            JitOptSymbol *callable;
+            callable = stack_pointer[-3];
+            PyObject *len = _PyInterpreterState_GET()->callable_cache.len;
+            if (sym_get_const(ctx, callable) == len) {
+                REPLACE_OP(this_instr, _NOP, 0, 0);
+            }
+            sym_set_const(callable, len);
+            break;
+        }
+
         case _CALL_LEN: {
             JitOptSymbol *res;
             res = sym_new_type(ctx, &PyLong_Type);
-            stack_pointer[-2 - oparg] = res;
-            stack_pointer += -1 - oparg;
+            stack_pointer[-3] = res;
+            stack_pointer += -2;
             assert(WITHIN_STACK_BOUNDS());
             break;
         }

diff --git a/Python/specialize.c b/Python/specialize.c
index fe4a65ee5f8079968e744ae2e81daebc54ccba97..7861f3845bfdbb4a67a87563d36330c8c0a2f733 100644 (file)
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -2147,7 +2147,7 @@ specialize_c_call(PyObject *callable, _Py_CODEUNIT *instr, int nargs)
             }
             /* len(o) */
             PyInterpreterState *interp = _PyInterpreterState_GET();
-            if (callable == interp->callable_cache.len) {
+            if (callable == interp->callable_cache.len && instr->op.arg == 1) {
                 specialize(instr, CALL_LEN);
                 return 0;
             }