GH-123232: Factor BINARY_SLICE and STORE_SLICE to handle stats properly for tier...

diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h
index 226f4a63460b37ef22d9b72da3539e00ff40b6ac..b950f760d74ac7335391054f0880ce2ce8182b19 100644 (file)
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -20,11 +20,11 @@ extern "C" {
 #define _BINARY_OP_MULTIPLY_INT 308
 #define _BINARY_OP_SUBTRACT_FLOAT 309
 #define _BINARY_OP_SUBTRACT_INT 310
-#define _BINARY_SLICE BINARY_SLICE
-#define _BINARY_SUBSCR 311
-#define _BINARY_SUBSCR_CHECK_FUNC 312
+#define _BINARY_SLICE 311
+#define _BINARY_SUBSCR 312
+#define _BINARY_SUBSCR_CHECK_FUNC 313
 #define _BINARY_SUBSCR_DICT BINARY_SUBSCR_DICT
-#define _BINARY_SUBSCR_INIT_CALL 313
+#define _BINARY_SUBSCR_INIT_CALL 314
 #define _BINARY_SUBSCR_LIST_INT BINARY_SUBSCR_LIST_INT
 #define _BINARY_SUBSCR_STR_INT BINARY_SUBSCR_STR_INT
 #define _BINARY_SUBSCR_TUPLE_INT BINARY_SUBSCR_TUPLE_INT
@@ -34,117 +34,117 @@ extern "C" {
 #define _BUILD_SLICE BUILD_SLICE
 #define _BUILD_STRING BUILD_STRING
 #define _BUILD_TUPLE BUILD_TUPLE
-#define _CALL_BUILTIN_CLASS 314
-#define _CALL_BUILTIN_FAST 315
-#define _CALL_BUILTIN_FAST_WITH_KEYWORDS 316
-#define _CALL_BUILTIN_O 317
+#define _CALL_BUILTIN_CLASS 315
+#define _CALL_BUILTIN_FAST 316
+#define _CALL_BUILTIN_FAST_WITH_KEYWORDS 317
+#define _CALL_BUILTIN_O 318
 #define _CALL_INTRINSIC_1 CALL_INTRINSIC_1
 #define _CALL_INTRINSIC_2 CALL_INTRINSIC_2
 #define _CALL_ISINSTANCE CALL_ISINSTANCE
-#define _CALL_KW_NON_PY 318
+#define _CALL_KW_NON_PY 319
 #define _CALL_LEN CALL_LEN
 #define _CALL_LIST_APPEND CALL_LIST_APPEND
-#define _CALL_METHOD_DESCRIPTOR_FAST 319
-#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 320
-#define _CALL_METHOD_DESCRIPTOR_NOARGS 321
-#define _CALL_METHOD_DESCRIPTOR_O 322
-#define _CALL_NON_PY_GENERAL 323
-#define _CALL_STR_1 324
-#define _CALL_TUPLE_1 325
+#define _CALL_METHOD_DESCRIPTOR_FAST 320
+#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 321
+#define _CALL_METHOD_DESCRIPTOR_NOARGS 322
+#define _CALL_METHOD_DESCRIPTOR_O 323
+#define _CALL_NON_PY_GENERAL 324
+#define _CALL_STR_1 325
+#define _CALL_TUPLE_1 326
 #define _CALL_TYPE_1 CALL_TYPE_1
-#define _CHECK_AND_ALLOCATE_OBJECT 326
-#define _CHECK_ATTR_CLASS 327
-#define _CHECK_ATTR_METHOD_LAZY_DICT 328
-#define _CHECK_ATTR_MODULE 329
-#define _CHECK_ATTR_WITH_HINT 330
-#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 331
+#define _CHECK_AND_ALLOCATE_OBJECT 327
+#define _CHECK_ATTR_CLASS 328
+#define _CHECK_ATTR_METHOD_LAZY_DICT 329
+#define _CHECK_ATTR_MODULE 330
+#define _CHECK_ATTR_WITH_HINT 331
+#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 332
 #define _CHECK_EG_MATCH CHECK_EG_MATCH
 #define _CHECK_EXC_MATCH CHECK_EXC_MATCH
-#define _CHECK_FUNCTION 332
-#define _CHECK_FUNCTION_EXACT_ARGS 333
-#define _CHECK_FUNCTION_VERSION 334
-#define _CHECK_FUNCTION_VERSION_KW 335
-#define _CHECK_IS_NOT_PY_CALLABLE 336
-#define _CHECK_IS_NOT_PY_CALLABLE_KW 337
-#define _CHECK_MANAGED_OBJECT_HAS_VALUES 338
-#define _CHECK_METHOD_VERSION 339
-#define _CHECK_METHOD_VERSION_KW 340
-#define _CHECK_PEP_523 341
-#define _CHECK_PERIODIC 342
-#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 343
-#define _CHECK_STACK_SPACE 344
-#define _CHECK_STACK_SPACE_OPERAND 345
-#define _CHECK_VALIDITY 346
-#define _CHECK_VALIDITY_AND_SET_IP 347
-#define _COMPARE_OP 348
-#define _COMPARE_OP_FLOAT 349
-#define _COMPARE_OP_INT 350
-#define _COMPARE_OP_STR 351
-#define _CONTAINS_OP 352
+#define _CHECK_FUNCTION 333
+#define _CHECK_FUNCTION_EXACT_ARGS 334
+#define _CHECK_FUNCTION_VERSION 335
+#define _CHECK_FUNCTION_VERSION_KW 336
+#define _CHECK_IS_NOT_PY_CALLABLE 337
+#define _CHECK_IS_NOT_PY_CALLABLE_KW 338
+#define _CHECK_MANAGED_OBJECT_HAS_VALUES 339
+#define _CHECK_METHOD_VERSION 340
+#define _CHECK_METHOD_VERSION_KW 341
+#define _CHECK_PEP_523 342
+#define _CHECK_PERIODIC 343
+#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 344
+#define _CHECK_STACK_SPACE 345
+#define _CHECK_STACK_SPACE_OPERAND 346
+#define _CHECK_VALIDITY 347
+#define _CHECK_VALIDITY_AND_SET_IP 348
+#define _COMPARE_OP 349
+#define _COMPARE_OP_FLOAT 350
+#define _COMPARE_OP_INT 351
+#define _COMPARE_OP_STR 352
+#define _CONTAINS_OP 353
 #define _CONTAINS_OP_DICT CONTAINS_OP_DICT
 #define _CONTAINS_OP_SET CONTAINS_OP_SET
 #define _CONVERT_VALUE CONVERT_VALUE
 #define _COPY COPY
 #define _COPY_FREE_VARS COPY_FREE_VARS
-#define _CREATE_INIT_FRAME 353
+#define _CREATE_INIT_FRAME 354
 #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 354
+#define _DEOPT 355
 #define _DICT_MERGE DICT_MERGE
 #define _DICT_UPDATE DICT_UPDATE
-#define _DO_CALL 355
-#define _DO_CALL_KW 356
-#define _DYNAMIC_EXIT 357
+#define _DO_CALL 356
+#define _DO_CALL_KW 357
+#define _DYNAMIC_EXIT 358
 #define _END_SEND END_SEND
-#define _ERROR_POP_N 358
+#define _ERROR_POP_N 359
 #define _EXIT_INIT_CHECK EXIT_INIT_CHECK
-#define _EXPAND_METHOD 359
-#define _EXPAND_METHOD_KW 360
-#define _FATAL_ERROR 361
+#define _EXPAND_METHOD 360
+#define _EXPAND_METHOD_KW 361
+#define _FATAL_ERROR 362
 #define _FORMAT_SIMPLE FORMAT_SIMPLE
 #define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC
-#define _FOR_ITER 362
-#define _FOR_ITER_GEN_FRAME 363
-#define _FOR_ITER_TIER_TWO 364
+#define _FOR_ITER 363
+#define _FOR_ITER_GEN_FRAME 364
+#define _FOR_ITER_TIER_TWO 365
 #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 365
-#define _GUARD_BOTH_INT 366
-#define _GUARD_BOTH_UNICODE 367
-#define _GUARD_BUILTINS_VERSION 368
-#define _GUARD_DORV_NO_DICT 369
-#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 370
-#define _GUARD_GLOBALS_VERSION 371
-#define _GUARD_IS_FALSE_POP 372
-#define _GUARD_IS_NONE_POP 373
-#define _GUARD_IS_NOT_NONE_POP 374
-#define _GUARD_IS_TRUE_POP 375
-#define _GUARD_KEYS_VERSION 376
-#define _GUARD_NOS_FLOAT 377
-#define _GUARD_NOS_INT 378
-#define _GUARD_NOT_EXHAUSTED_LIST 379
-#define _GUARD_NOT_EXHAUSTED_RANGE 380
-#define _GUARD_NOT_EXHAUSTED_TUPLE 381
-#define _GUARD_TOS_FLOAT 382
-#define _GUARD_TOS_INT 383
-#define _GUARD_TYPE_VERSION 384
+#define _GUARD_BOTH_FLOAT 366
+#define _GUARD_BOTH_INT 367
+#define _GUARD_BOTH_UNICODE 368
+#define _GUARD_BUILTINS_VERSION 369
+#define _GUARD_DORV_NO_DICT 370
+#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 371
+#define _GUARD_GLOBALS_VERSION 372
+#define _GUARD_IS_FALSE_POP 373
+#define _GUARD_IS_NONE_POP 374
+#define _GUARD_IS_NOT_NONE_POP 375
+#define _GUARD_IS_TRUE_POP 376
+#define _GUARD_KEYS_VERSION 377
+#define _GUARD_NOS_FLOAT 378
+#define _GUARD_NOS_INT 379
+#define _GUARD_NOT_EXHAUSTED_LIST 380
+#define _GUARD_NOT_EXHAUSTED_RANGE 381
+#define _GUARD_NOT_EXHAUSTED_TUPLE 382
+#define _GUARD_TOS_FLOAT 383
+#define _GUARD_TOS_INT 384
+#define _GUARD_TYPE_VERSION 385
 #define _IMPORT_FROM IMPORT_FROM
 #define _IMPORT_NAME IMPORT_NAME
-#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 385
-#define _INIT_CALL_PY_EXACT_ARGS 386
-#define _INIT_CALL_PY_EXACT_ARGS_0 387
-#define _INIT_CALL_PY_EXACT_ARGS_1 388
-#define _INIT_CALL_PY_EXACT_ARGS_2 389
-#define _INIT_CALL_PY_EXACT_ARGS_3 390
-#define _INIT_CALL_PY_EXACT_ARGS_4 391
+#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 386
+#define _INIT_CALL_PY_EXACT_ARGS 387
+#define _INIT_CALL_PY_EXACT_ARGS_0 388
+#define _INIT_CALL_PY_EXACT_ARGS_1 389
+#define _INIT_CALL_PY_EXACT_ARGS_2 390
+#define _INIT_CALL_PY_EXACT_ARGS_3 391
+#define _INIT_CALL_PY_EXACT_ARGS_4 392
 #define _INSTRUMENTED_CALL_FUNCTION_EX INSTRUMENTED_CALL_FUNCTION_EX
 #define _INSTRUMENTED_CALL_KW INSTRUMENTED_CALL_KW
 #define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER
@@ -156,65 +156,65 @@ 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 _INTERNAL_INCREMENT_OPT_COUNTER 392
-#define _IS_NONE 393
+#define _INTERNAL_INCREMENT_OPT_COUNTER 393
+#define _IS_NONE 394
 #define _IS_OP IS_OP
-#define _ITER_CHECK_LIST 394
-#define _ITER_CHECK_RANGE 395
-#define _ITER_CHECK_TUPLE 396
-#define _ITER_JUMP_LIST 397
-#define _ITER_JUMP_RANGE 398
-#define _ITER_JUMP_TUPLE 399
-#define _ITER_NEXT_LIST 400
-#define _ITER_NEXT_RANGE 401
-#define _ITER_NEXT_TUPLE 402
-#define _JUMP_TO_TOP 403
+#define _ITER_CHECK_LIST 395
+#define _ITER_CHECK_RANGE 396
+#define _ITER_CHECK_TUPLE 397
+#define _ITER_JUMP_LIST 398
+#define _ITER_JUMP_RANGE 399
+#define _ITER_JUMP_TUPLE 400
+#define _ITER_NEXT_LIST 401
+#define _ITER_NEXT_RANGE 402
+#define _ITER_NEXT_TUPLE 403
+#define _JUMP_TO_TOP 404
 #define _LIST_APPEND LIST_APPEND
 #define _LIST_EXTEND LIST_EXTEND
-#define _LOAD_ATTR 404
-#define _LOAD_ATTR_CLASS 405
-#define _LOAD_ATTR_CLASS_0 406
-#define _LOAD_ATTR_CLASS_1 407
+#define _LOAD_ATTR 405
+#define _LOAD_ATTR_CLASS 406
+#define _LOAD_ATTR_CLASS_0 407
+#define _LOAD_ATTR_CLASS_1 408
 #define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN
-#define _LOAD_ATTR_INSTANCE_VALUE 408
-#define _LOAD_ATTR_INSTANCE_VALUE_0 409
-#define _LOAD_ATTR_INSTANCE_VALUE_1 410
-#define _LOAD_ATTR_METHOD_LAZY_DICT 411
-#define _LOAD_ATTR_METHOD_NO_DICT 412
-#define _LOAD_ATTR_METHOD_WITH_VALUES 413
-#define _LOAD_ATTR_MODULE 414
-#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 415
-#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 416
-#define _LOAD_ATTR_PROPERTY_FRAME 417
-#define _LOAD_ATTR_SLOT 418
-#define _LOAD_ATTR_SLOT_0 419
-#define _LOAD_ATTR_SLOT_1 420
-#define _LOAD_ATTR_WITH_HINT 421
+#define _LOAD_ATTR_INSTANCE_VALUE 409
+#define _LOAD_ATTR_INSTANCE_VALUE_0 410
+#define _LOAD_ATTR_INSTANCE_VALUE_1 411
+#define _LOAD_ATTR_METHOD_LAZY_DICT 412
+#define _LOAD_ATTR_METHOD_NO_DICT 413
+#define _LOAD_ATTR_METHOD_WITH_VALUES 414
+#define _LOAD_ATTR_MODULE 415
+#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 416
+#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 417
+#define _LOAD_ATTR_PROPERTY_FRAME 418
+#define _LOAD_ATTR_SLOT 419
+#define _LOAD_ATTR_SLOT_0 420
+#define _LOAD_ATTR_SLOT_1 421
+#define _LOAD_ATTR_WITH_HINT 422
 #define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS
 #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT
 #define _LOAD_CONST LOAD_CONST
-#define _LOAD_CONST_INLINE 422
-#define _LOAD_CONST_INLINE_BORROW 423
-#define _LOAD_CONST_INLINE_BORROW_WITH_NULL 424
-#define _LOAD_CONST_INLINE_WITH_NULL 425
+#define _LOAD_CONST_INLINE 423
+#define _LOAD_CONST_INLINE_BORROW 424
+#define _LOAD_CONST_INLINE_BORROW_WITH_NULL 425
+#define _LOAD_CONST_INLINE_WITH_NULL 426
 #define _LOAD_DEREF LOAD_DEREF
-#define _LOAD_FAST 426
-#define _LOAD_FAST_0 427
-#define _LOAD_FAST_1 428
-#define _LOAD_FAST_2 429
-#define _LOAD_FAST_3 430
-#define _LOAD_FAST_4 431
-#define _LOAD_FAST_5 432
-#define _LOAD_FAST_6 433
-#define _LOAD_FAST_7 434
+#define _LOAD_FAST 427
+#define _LOAD_FAST_0 428
+#define _LOAD_FAST_1 429
+#define _LOAD_FAST_2 430
+#define _LOAD_FAST_3 431
+#define _LOAD_FAST_4 432
+#define _LOAD_FAST_5 433
+#define _LOAD_FAST_6 434
+#define _LOAD_FAST_7 435
 #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 435
-#define _LOAD_GLOBAL_BUILTINS 436
-#define _LOAD_GLOBAL_MODULE 437
+#define _LOAD_GLOBAL 436
+#define _LOAD_GLOBAL_BUILTINS 437
+#define _LOAD_GLOBAL_MODULE 438
 #define _LOAD_LOCALS LOAD_LOCALS
 #define _LOAD_NAME LOAD_NAME
 #define _LOAD_SPECIAL LOAD_SPECIAL
@@ -227,59 +227,59 @@ extern "C" {
 #define _MATCH_KEYS MATCH_KEYS
 #define _MATCH_MAPPING MATCH_MAPPING
 #define _MATCH_SEQUENCE MATCH_SEQUENCE
-#define _MAYBE_EXPAND_METHOD 438
-#define _MONITOR_CALL 439
-#define _MONITOR_JUMP_BACKWARD 440
-#define _MONITOR_RESUME 441
+#define _MAYBE_EXPAND_METHOD 439
+#define _MONITOR_CALL 440
+#define _MONITOR_JUMP_BACKWARD 441
+#define _MONITOR_RESUME 442
 #define _NOP NOP
 #define _POP_EXCEPT POP_EXCEPT
-#define _POP_JUMP_IF_FALSE 442
-#define _POP_JUMP_IF_TRUE 443
+#define _POP_JUMP_IF_FALSE 443
+#define _POP_JUMP_IF_TRUE 444
 #define _POP_TOP POP_TOP
-#define _POP_TOP_LOAD_CONST_INLINE_BORROW 444
+#define _POP_TOP_LOAD_CONST_INLINE_BORROW 445
 #define _PUSH_EXC_INFO PUSH_EXC_INFO
-#define _PUSH_FRAME 445
+#define _PUSH_FRAME 446
 #define _PUSH_NULL PUSH_NULL
-#define _PY_FRAME_GENERAL 446
-#define _PY_FRAME_KW 447
-#define _QUICKEN_RESUME 448
-#define _REPLACE_WITH_TRUE 449
+#define _PY_FRAME_GENERAL 447
+#define _PY_FRAME_KW 448
+#define _QUICKEN_RESUME 449
+#define _REPLACE_WITH_TRUE 450
 #define _RESUME_CHECK RESUME_CHECK
 #define _RETURN_GENERATOR RETURN_GENERATOR
 #define _RETURN_VALUE RETURN_VALUE
-#define _SAVE_RETURN_OFFSET 450
-#define _SEND 451
-#define _SEND_GEN_FRAME 452
+#define _SAVE_RETURN_OFFSET 451
+#define _SEND 452
+#define _SEND_GEN_FRAME 453
 #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 453
-#define _STORE_ATTR 454
-#define _STORE_ATTR_INSTANCE_VALUE 455
-#define _STORE_ATTR_SLOT 456
-#define _STORE_ATTR_WITH_HINT 457
+#define _START_EXECUTOR 454
+#define _STORE_ATTR 455
+#define _STORE_ATTR_INSTANCE_VALUE 456
+#define _STORE_ATTR_SLOT 457
+#define _STORE_ATTR_WITH_HINT 458
 #define _STORE_DEREF STORE_DEREF
-#define _STORE_FAST 458
-#define _STORE_FAST_0 459
-#define _STORE_FAST_1 460
-#define _STORE_FAST_2 461
-#define _STORE_FAST_3 462
-#define _STORE_FAST_4 463
-#define _STORE_FAST_5 464
-#define _STORE_FAST_6 465
-#define _STORE_FAST_7 466
+#define _STORE_FAST 459
+#define _STORE_FAST_0 460
+#define _STORE_FAST_1 461
+#define _STORE_FAST_2 462
+#define _STORE_FAST_3 463
+#define _STORE_FAST_4 464
+#define _STORE_FAST_5 465
+#define _STORE_FAST_6 466
+#define _STORE_FAST_7 467
 #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 467
+#define _STORE_SLICE 468
+#define _STORE_SUBSCR 469
 #define _STORE_SUBSCR_DICT STORE_SUBSCR_DICT
 #define _STORE_SUBSCR_LIST_INT STORE_SUBSCR_LIST_INT
 #define _SWAP SWAP
-#define _TIER2_RESUME_CHECK 468
-#define _TO_BOOL 469
+#define _TIER2_RESUME_CHECK 470
+#define _TO_BOOL 471
 #define _TO_BOOL_BOOL TO_BOOL_BOOL
 #define _TO_BOOL_INT TO_BOOL_INT
 #define _TO_BOOL_LIST TO_BOOL_LIST
@@ -289,14 +289,14 @@ extern "C" {
 #define _UNARY_NEGATIVE UNARY_NEGATIVE
 #define _UNARY_NOT UNARY_NOT
 #define _UNPACK_EX UNPACK_EX
-#define _UNPACK_SEQUENCE 470
+#define _UNPACK_SEQUENCE 472
 #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 __DO_CALL_FUNCTION_EX _DO_CALL_FUNCTION_EX
-#define MAX_UOP_ID 470
+#define MAX_UOP_ID 472
 
 #ifdef __cplusplus
 }

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index ad30fb3db0360a4d3eeba4611aa7366b0a861c9c..01e88a34d10b6a6e405b4aaf0240d65acdeb1839 100644 (file)
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -668,11 +668,17 @@ dummy_func(
 
         macro(BINARY_SUBSCR) = _SPECIALIZE_BINARY_SUBSCR + _BINARY_SUBSCR;
 
-        inst(BINARY_SLICE, (container, start, stop -- res)) {
+        specializing op(_SPECIALIZE_BINARY_SLICE, (container, start, stop -- container, start, stop)) {
+            // Placeholder until we implement BINARY_SLICE specialization
+            #if ENABLE_SPECIALIZATION
+            OPCODE_DEFERRED_INC(BINARY_SLICE);
+            #endif  /* ENABLE_SPECIALIZATION */
+        }
+
+        op(_BINARY_SLICE, (container, start, stop -- res)) {
             PyObject *slice = _PyBuildSlice_ConsumeRefs(PyStackRef_AsPyObjectSteal(start),
                                                         PyStackRef_AsPyObjectSteal(stop));
             PyObject *res_o;
-            OPCODE_DEFERRED_INC(BINARY_SLICE);
             // Can't use ERROR_IF() here, because we haven't
             // DECREF'ed container yet, and we still own slice.
             if (slice == NULL) {
@@ -687,10 +693,18 @@ dummy_func(
             res = PyStackRef_FromPyObjectSteal(res_o);
         }
 
-        inst(STORE_SLICE, (v, container, start, stop -- )) {
+        macro(BINARY_SLICE) = _SPECIALIZE_BINARY_SLICE + _BINARY_SLICE;
+
+        specializing op(_SPECIALIZE_STORE_SLICE, (v, container, start, stop -- v, container, start, stop)) {
+            // Placeholder until we implement STORE_SLICE specialization
+            #if ENABLE_SPECIALIZATION
+            OPCODE_DEFERRED_INC(STORE_SLICE);
+            #endif  /* ENABLE_SPECIALIZATION */
+        }
+
+        op(_STORE_SLICE, (v, container, start, stop -- )) {
             PyObject *slice = _PyBuildSlice_ConsumeRefs(PyStackRef_AsPyObjectSteal(start),
                                                         PyStackRef_AsPyObjectSteal(stop));
-            OPCODE_DEFERRED_INC(STORE_SLICE);
             int err;
             if (slice == NULL) {
                 err = 1;
@@ -704,6 +718,8 @@ dummy_func(
             ERROR_IF(err, error);
         }
 
+        macro(STORE_SLICE) = _SPECIALIZE_STORE_SLICE + _STORE_SLICE;
+
         inst(BINARY_SUBSCR_LIST_INT, (unused/1, list_st, sub_st -- res)) {
             PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
             PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 3d0f3b36a40ed2ec042bb5fdeed990232726a5cb..0de5c8a0408d8c177a99a66e953af0d9ece471cd 100644 (file)
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -797,7 +797,6 @@
             PyObject *slice = _PyBuildSlice_ConsumeRefs(PyStackRef_AsPyObjectSteal(start),
                 PyStackRef_AsPyObjectSteal(stop));
             PyObject *res_o;
-            OPCODE_DEFERRED_INC(BINARY_SLICE);
             // Can't use ERROR_IF() here, because we haven't
             // DECREF'ed container yet, and we still own slice.
             if (slice == NULL) {
@@ -827,7 +826,6 @@
             v = stack_pointer[-4];
             PyObject *slice = _PyBuildSlice_ConsumeRefs(PyStackRef_AsPyObjectSteal(start),
                 PyStackRef_AsPyObjectSteal(stop));
-            OPCODE_DEFERRED_INC(STORE_SLICE);
             int err;
             if (slice == NULL) {
                 err = 1;

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index bf75cb901bc46dcb97c0fe2a3de1b371f6b2832e..9a751011678ed42caaa8aeb0b908cf71ba23dcca 100644 (file)
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -371,25 +371,34 @@
             _PyStackRef start;
             _PyStackRef stop;
             _PyStackRef res;
+            // _SPECIALIZE_BINARY_SLICE
+            {
+                // Placeholder until we implement BINARY_SLICE specialization
+                #if ENABLE_SPECIALIZATION
+                OPCODE_DEFERRED_INC(BINARY_SLICE);
+                #endif  /* ENABLE_SPECIALIZATION */
+            }
+            // _BINARY_SLICE
             stop = stack_pointer[-1];
             start = stack_pointer[-2];
             container = stack_pointer[-3];
-            PyObject *slice = _PyBuildSlice_ConsumeRefs(PyStackRef_AsPyObjectSteal(start),
-                PyStackRef_AsPyObjectSteal(stop));
-            PyObject *res_o;
-            OPCODE_DEFERRED_INC(BINARY_SLICE);
-            // Can't use ERROR_IF() here, because we haven't
-            // DECREF'ed container yet, and we still own slice.
-            if (slice == NULL) {
-                res_o = NULL;
-            }
-            else {
-                res_o = PyObject_GetItem(PyStackRef_AsPyObjectBorrow(container), slice);
-                Py_DECREF(slice);
+            {
+                PyObject *slice = _PyBuildSlice_ConsumeRefs(PyStackRef_AsPyObjectSteal(start),
+                    PyStackRef_AsPyObjectSteal(stop));
+                PyObject *res_o;
+                // Can't use ERROR_IF() here, because we haven't
+                // DECREF'ed container yet, and we still own slice.
+                if (slice == NULL) {
+                    res_o = NULL;
+                }
+                else {
+                    res_o = PyObject_GetItem(PyStackRef_AsPyObjectBorrow(container), slice);
+                    Py_DECREF(slice);
+                }
+                PyStackRef_CLOSE(container);
+                if (res_o == NULL) goto pop_3_error;
+                res = PyStackRef_FromPyObjectSteal(res_o);
             }
-            PyStackRef_CLOSE(container);
-            if (res_o == NULL) goto pop_3_error;
-            res = PyStackRef_FromPyObjectSteal(res_o);
             stack_pointer[-3] = res;
             stack_pointer += -2;
             assert(WITHIN_STACK_BOUNDS());
@@ -7085,24 +7094,33 @@
             _PyStackRef container;
             _PyStackRef start;
             _PyStackRef stop;
+            // _SPECIALIZE_STORE_SLICE
+            {
+                // Placeholder until we implement STORE_SLICE specialization
+                #if ENABLE_SPECIALIZATION
+                OPCODE_DEFERRED_INC(STORE_SLICE);
+                #endif  /* ENABLE_SPECIALIZATION */
+            }
+            // _STORE_SLICE
             stop = stack_pointer[-1];
             start = stack_pointer[-2];
             container = stack_pointer[-3];
             v = stack_pointer[-4];
-            PyObject *slice = _PyBuildSlice_ConsumeRefs(PyStackRef_AsPyObjectSteal(start),
-                PyStackRef_AsPyObjectSteal(stop));
-            OPCODE_DEFERRED_INC(STORE_SLICE);
-            int err;
-            if (slice == NULL) {
-                err = 1;
-            }
-            else {
-                err = PyObject_SetItem(PyStackRef_AsPyObjectBorrow(container), slice, PyStackRef_AsPyObjectBorrow(v));
-                Py_DECREF(slice);
+            {
+                PyObject *slice = _PyBuildSlice_ConsumeRefs(PyStackRef_AsPyObjectSteal(start),
+                    PyStackRef_AsPyObjectSteal(stop));
+                int err;
+                if (slice == NULL) {
+                    err = 1;
+                }
+                else {
+                    err = PyObject_SetItem(PyStackRef_AsPyObjectBorrow(container), slice, PyStackRef_AsPyObjectBorrow(v));
+                    Py_DECREF(slice);
+                }
+                PyStackRef_CLOSE(v);
+                PyStackRef_CLOSE(container);
+                if (err) goto pop_4_error;
             }
-            PyStackRef_CLOSE(v);
-            PyStackRef_CLOSE(container);
-            if (err) goto pop_4_error;
             stack_pointer += -4;
             assert(WITHIN_STACK_BOUNDS());
             DISPATCH();