reduce diff

diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h
index 071edfaa7a52be51b76eb252a858937b9c1e2d7b..7a33a5b84fd21ac09376d896722830c8881a54bc 100644 (file)
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -109,80 +109,79 @@ extern "C" {
 #define _DO_CALL 375
 #define _DO_CALL_FUNCTION_EX 376
 #define _DO_CALL_KW 377
-#define _DYNAMIC_DEOPT 378
-#define _DYNAMIC_EXIT 379
+#define _DYNAMIC_EXIT 378
 #define _END_FOR END_FOR
 #define _END_SEND END_SEND
-#define _ERROR_POP_N 380
+#define _ERROR_POP_N 379
 #define _EXIT_INIT_CHECK EXIT_INIT_CHECK
-#define _EXPAND_METHOD 381
-#define _EXPAND_METHOD_KW 382
-#define _FATAL_ERROR 383
+#define _EXPAND_METHOD 380
+#define _EXPAND_METHOD_KW 381
+#define _FATAL_ERROR 382
 #define _FORMAT_SIMPLE FORMAT_SIMPLE
 #define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC
-#define _FOR_ITER 384
-#define _FOR_ITER_GEN_FRAME 385
-#define _FOR_ITER_TIER_TWO 386
+#define _FOR_ITER 383
+#define _FOR_ITER_GEN_FRAME 384
+#define _FOR_ITER_TIER_TWO 385
 #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 387
-#define _GUARD_CALLABLE_ISINSTANCE 388
-#define _GUARD_CALLABLE_LEN 389
-#define _GUARD_CALLABLE_LIST_APPEND 390
-#define _GUARD_CALLABLE_STR_1 391
-#define _GUARD_CALLABLE_TUPLE_1 392
-#define _GUARD_CALLABLE_TYPE_1 393
-#define _GUARD_DORV_NO_DICT 394
-#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 395
-#define _GUARD_GLOBALS_VERSION 396
-#define _GUARD_IP_RETURN_GENERATOR 397
-#define _GUARD_IP_RETURN_VALUE 398
-#define _GUARD_IP_YIELD_VALUE 399
-#define _GUARD_IP__PUSH_FRAME 400
-#define _GUARD_IS_FALSE_POP 401
-#define _GUARD_IS_NONE_POP 402
-#define _GUARD_IS_NOT_NONE_POP 403
-#define _GUARD_IS_TRUE_POP 404
-#define _GUARD_KEYS_VERSION 405
-#define _GUARD_NOS_DICT 406
-#define _GUARD_NOS_FLOAT 407
-#define _GUARD_NOS_INT 408
-#define _GUARD_NOS_LIST 409
-#define _GUARD_NOS_NOT_NULL 410
-#define _GUARD_NOS_NULL 411
-#define _GUARD_NOS_OVERFLOWED 412
-#define _GUARD_NOS_TUPLE 413
-#define _GUARD_NOS_UNICODE 414
-#define _GUARD_NOT_EXHAUSTED_LIST 415
-#define _GUARD_NOT_EXHAUSTED_RANGE 416
-#define _GUARD_NOT_EXHAUSTED_TUPLE 417
-#define _GUARD_THIRD_NULL 418
-#define _GUARD_TOS_ANY_SET 419
-#define _GUARD_TOS_DICT 420
-#define _GUARD_TOS_FLOAT 421
-#define _GUARD_TOS_INT 422
-#define _GUARD_TOS_LIST 423
-#define _GUARD_TOS_OVERFLOWED 424
-#define _GUARD_TOS_SLICE 425
-#define _GUARD_TOS_TUPLE 426
-#define _GUARD_TOS_UNICODE 427
-#define _GUARD_TYPE_VERSION 428
-#define _GUARD_TYPE_VERSION_AND_LOCK 429
-#define _HANDLE_PENDING_AND_DEOPT 430
+#define _GUARD_BINARY_OP_EXTEND 386
+#define _GUARD_CALLABLE_ISINSTANCE 387
+#define _GUARD_CALLABLE_LEN 388
+#define _GUARD_CALLABLE_LIST_APPEND 389
+#define _GUARD_CALLABLE_STR_1 390
+#define _GUARD_CALLABLE_TUPLE_1 391
+#define _GUARD_CALLABLE_TYPE_1 392
+#define _GUARD_DORV_NO_DICT 393
+#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 394
+#define _GUARD_GLOBALS_VERSION 395
+#define _GUARD_IP_RETURN_GENERATOR 396
+#define _GUARD_IP_RETURN_VALUE 397
+#define _GUARD_IP_YIELD_VALUE 398
+#define _GUARD_IP__PUSH_FRAME 399
+#define _GUARD_IS_FALSE_POP 400
+#define _GUARD_IS_NONE_POP 401
+#define _GUARD_IS_NOT_NONE_POP 402
+#define _GUARD_IS_TRUE_POP 403
+#define _GUARD_KEYS_VERSION 404
+#define _GUARD_NOS_DICT 405
+#define _GUARD_NOS_FLOAT 406
+#define _GUARD_NOS_INT 407
+#define _GUARD_NOS_LIST 408
+#define _GUARD_NOS_NOT_NULL 409
+#define _GUARD_NOS_NULL 410
+#define _GUARD_NOS_OVERFLOWED 411
+#define _GUARD_NOS_TUPLE 412
+#define _GUARD_NOS_UNICODE 413
+#define _GUARD_NOT_EXHAUSTED_LIST 414
+#define _GUARD_NOT_EXHAUSTED_RANGE 415
+#define _GUARD_NOT_EXHAUSTED_TUPLE 416
+#define _GUARD_THIRD_NULL 417
+#define _GUARD_TOS_ANY_SET 418
+#define _GUARD_TOS_DICT 419
+#define _GUARD_TOS_FLOAT 420
+#define _GUARD_TOS_INT 421
+#define _GUARD_TOS_LIST 422
+#define _GUARD_TOS_OVERFLOWED 423
+#define _GUARD_TOS_SLICE 424
+#define _GUARD_TOS_TUPLE 425
+#define _GUARD_TOS_UNICODE 426
+#define _GUARD_TYPE_VERSION 427
+#define _GUARD_TYPE_VERSION_AND_LOCK 428
+#define _HANDLE_PENDING_AND_DEOPT 429
 #define _IMPORT_FROM IMPORT_FROM
 #define _IMPORT_NAME IMPORT_NAME
-#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 431
-#define _INIT_CALL_PY_EXACT_ARGS 432
-#define _INIT_CALL_PY_EXACT_ARGS_0 433
-#define _INIT_CALL_PY_EXACT_ARGS_1 434
-#define _INIT_CALL_PY_EXACT_ARGS_2 435
-#define _INIT_CALL_PY_EXACT_ARGS_3 436
-#define _INIT_CALL_PY_EXACT_ARGS_4 437
-#define _INSERT_NULL 438
+#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 430
+#define _INIT_CALL_PY_EXACT_ARGS 431
+#define _INIT_CALL_PY_EXACT_ARGS_0 432
+#define _INIT_CALL_PY_EXACT_ARGS_1 433
+#define _INIT_CALL_PY_EXACT_ARGS_2 434
+#define _INIT_CALL_PY_EXACT_ARGS_3 435
+#define _INIT_CALL_PY_EXACT_ARGS_4 436
+#define _INSERT_NULL 437
 #define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER
 #define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION
 #define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD
@@ -192,179 +191,178 @@ 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 439
+#define _IS_NONE 438
 #define _IS_OP IS_OP
-#define _ITER_CHECK_LIST 440
-#define _ITER_CHECK_RANGE 441
-#define _ITER_CHECK_TUPLE 442
-#define _ITER_JUMP_LIST 443
-#define _ITER_JUMP_RANGE 444
-#define _ITER_JUMP_TUPLE 445
-#define _ITER_NEXT_LIST 446
-#define _ITER_NEXT_LIST_TIER_TWO 447
-#define _ITER_NEXT_RANGE 448
-#define _ITER_NEXT_TUPLE 449
+#define _ITER_CHECK_LIST 439
+#define _ITER_CHECK_RANGE 440
+#define _ITER_CHECK_TUPLE 441
+#define _ITER_JUMP_LIST 442
+#define _ITER_JUMP_RANGE 443
+#define _ITER_JUMP_TUPLE 444
+#define _ITER_NEXT_LIST 445
+#define _ITER_NEXT_LIST_TIER_TWO 446
+#define _ITER_NEXT_RANGE 447
+#define _ITER_NEXT_TUPLE 448
 #define _JUMP_BACKWARD_NO_INTERRUPT JUMP_BACKWARD_NO_INTERRUPT
-#define _JUMP_TO_TOP 450
+#define _JUMP_TO_TOP 449
 #define _LIST_APPEND LIST_APPEND
 #define _LIST_EXTEND LIST_EXTEND
-#define _LOAD_ATTR 451
-#define _LOAD_ATTR_CLASS 452
+#define _LOAD_ATTR 450
+#define _LOAD_ATTR_CLASS 451
 #define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN
-#define _LOAD_ATTR_INSTANCE_VALUE 453
-#define _LOAD_ATTR_METHOD_LAZY_DICT 454
-#define _LOAD_ATTR_METHOD_NO_DICT 455
-#define _LOAD_ATTR_METHOD_WITH_VALUES 456
-#define _LOAD_ATTR_MODULE 457
-#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 458
-#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 459
-#define _LOAD_ATTR_PROPERTY_FRAME 460
-#define _LOAD_ATTR_SLOT 461
-#define _LOAD_ATTR_WITH_HINT 462
+#define _LOAD_ATTR_INSTANCE_VALUE 452
+#define _LOAD_ATTR_METHOD_LAZY_DICT 453
+#define _LOAD_ATTR_METHOD_NO_DICT 454
+#define _LOAD_ATTR_METHOD_WITH_VALUES 455
+#define _LOAD_ATTR_MODULE 456
+#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 457
+#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 458
+#define _LOAD_ATTR_PROPERTY_FRAME 459
+#define _LOAD_ATTR_SLOT 460
+#define _LOAD_ATTR_WITH_HINT 461
 #define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS
-#define _LOAD_BYTECODE 463
+#define _LOAD_BYTECODE 462
 #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT
 #define _LOAD_CONST LOAD_CONST
-#define _LOAD_CONST_INLINE 464
-#define _LOAD_CONST_INLINE_BORROW 465
-#define _LOAD_CONST_UNDER_INLINE 466
-#define _LOAD_CONST_UNDER_INLINE_BORROW 467
+#define _LOAD_CONST_INLINE 463
+#define _LOAD_CONST_INLINE_BORROW 464
+#define _LOAD_CONST_UNDER_INLINE 465
+#define _LOAD_CONST_UNDER_INLINE_BORROW 466
 #define _LOAD_DEREF LOAD_DEREF
-#define _LOAD_FAST 468
-#define _LOAD_FAST_0 469
-#define _LOAD_FAST_1 470
-#define _LOAD_FAST_2 471
-#define _LOAD_FAST_3 472
-#define _LOAD_FAST_4 473
-#define _LOAD_FAST_5 474
-#define _LOAD_FAST_6 475
-#define _LOAD_FAST_7 476
+#define _LOAD_FAST 467
+#define _LOAD_FAST_0 468
+#define _LOAD_FAST_1 469
+#define _LOAD_FAST_2 470
+#define _LOAD_FAST_3 471
+#define _LOAD_FAST_4 472
+#define _LOAD_FAST_5 473
+#define _LOAD_FAST_6 474
+#define _LOAD_FAST_7 475
 #define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR
-#define _LOAD_FAST_BORROW 477
-#define _LOAD_FAST_BORROW_0 478
-#define _LOAD_FAST_BORROW_1 479
-#define _LOAD_FAST_BORROW_2 480
-#define _LOAD_FAST_BORROW_3 481
-#define _LOAD_FAST_BORROW_4 482
-#define _LOAD_FAST_BORROW_5 483
-#define _LOAD_FAST_BORROW_6 484
-#define _LOAD_FAST_BORROW_7 485
+#define _LOAD_FAST_BORROW 476
+#define _LOAD_FAST_BORROW_0 477
+#define _LOAD_FAST_BORROW_1 478
+#define _LOAD_FAST_BORROW_2 479
+#define _LOAD_FAST_BORROW_3 480
+#define _LOAD_FAST_BORROW_4 481
+#define _LOAD_FAST_BORROW_5 482
+#define _LOAD_FAST_BORROW_6 483
+#define _LOAD_FAST_BORROW_7 484
 #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 486
-#define _LOAD_GLOBAL_BUILTINS 487
-#define _LOAD_GLOBAL_MODULE 488
+#define _LOAD_GLOBAL 485
+#define _LOAD_GLOBAL_BUILTINS 486
+#define _LOAD_GLOBAL_MODULE 487
 #define _LOAD_LOCALS LOAD_LOCALS
 #define _LOAD_NAME LOAD_NAME
-#define _LOAD_SMALL_INT 489
-#define _LOAD_SMALL_INT_0 490
-#define _LOAD_SMALL_INT_1 491
-#define _LOAD_SMALL_INT_2 492
-#define _LOAD_SMALL_INT_3 493
-#define _LOAD_SPECIAL 494
+#define _LOAD_SMALL_INT 488
+#define _LOAD_SMALL_INT_0 489
+#define _LOAD_SMALL_INT_1 490
+#define _LOAD_SMALL_INT_2 491
+#define _LOAD_SMALL_INT_3 492
+#define _LOAD_SPECIAL 493
 #define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR
 #define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD
-#define _MAKE_CALLARGS_A_TUPLE 495
+#define _MAKE_CALLARGS_A_TUPLE 494
 #define _MAKE_CELL MAKE_CELL
 #define _MAKE_FUNCTION MAKE_FUNCTION
-#define _MAKE_WARM 496
+#define _MAKE_WARM 495
 #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 497
-#define _MAYBE_EXPAND_METHOD_KW 498
-#define _MONITOR_CALL 499
-#define _MONITOR_CALL_KW 500
-#define _MONITOR_JUMP_BACKWARD 501
-#define _MONITOR_RESUME 502
+#define _MAYBE_EXPAND_METHOD 496
+#define _MAYBE_EXPAND_METHOD_KW 497
+#define _MONITOR_CALL 498
+#define _MONITOR_CALL_KW 499
+#define _MONITOR_JUMP_BACKWARD 500
+#define _MONITOR_RESUME 501
 #define _NOP NOP
-#define _POP_CALL 503
-#define _POP_CALL_LOAD_CONST_INLINE_BORROW 504
-#define _POP_CALL_ONE 505
-#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW 506
-#define _POP_CALL_TWO 507
-#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW 508
+#define _POP_CALL 502
+#define _POP_CALL_LOAD_CONST_INLINE_BORROW 503
+#define _POP_CALL_ONE 504
+#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW 505
+#define _POP_CALL_TWO 506
+#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW 507
 #define _POP_EXCEPT POP_EXCEPT
 #define _POP_ITER POP_ITER
-#define _POP_JUMP_IF_FALSE 509
-#define _POP_JUMP_IF_TRUE 510
+#define _POP_JUMP_IF_FALSE 508
+#define _POP_JUMP_IF_TRUE 509
 #define _POP_TOP POP_TOP
-#define _POP_TOP_FLOAT 511
-#define _POP_TOP_INT 512
-#define _POP_TOP_LOAD_CONST_INLINE 513
-#define _POP_TOP_LOAD_CONST_INLINE_BORROW 514
-#define _POP_TOP_NOP 515
-#define _POP_TOP_UNICODE 516
-#define _POP_TWO 517
-#define _POP_TWO_LOAD_CONST_INLINE_BORROW 518
+#define _POP_TOP_FLOAT 510
+#define _POP_TOP_INT 511
+#define _POP_TOP_LOAD_CONST_INLINE 512
+#define _POP_TOP_LOAD_CONST_INLINE_BORROW 513
+#define _POP_TOP_NOP 514
+#define _POP_TOP_UNICODE 515
+#define _POP_TWO 516
+#define _POP_TWO_LOAD_CONST_INLINE_BORROW 517
 #define _PUSH_EXC_INFO PUSH_EXC_INFO
-#define _PUSH_FRAME 519
+#define _PUSH_FRAME 518
 #define _PUSH_NULL PUSH_NULL
-#define _PUSH_NULL_CONDITIONAL 520
-#define _PY_FRAME_GENERAL 521
-#define _PY_FRAME_KW 522
-#define _QUICKEN_RESUME 523
-#define _REPLACE_WITH_TRUE 524
+#define _PUSH_NULL_CONDITIONAL 519
+#define _PY_FRAME_GENERAL 520
+#define _PY_FRAME_KW 521
+#define _QUICKEN_RESUME 522
+#define _REPLACE_WITH_TRUE 523
 #define _RESUME_CHECK RESUME_CHECK
 #define _RETURN_GENERATOR RETURN_GENERATOR
 #define _RETURN_VALUE RETURN_VALUE
-#define _SAVE_RETURN_OFFSET 525
-#define _SEND 526
-#define _SEND_GEN_FRAME 527
+#define _SAVE_RETURN_OFFSET 524
+#define _SEND 525
+#define _SEND_GEN_FRAME 526
 #define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS
 #define _SET_ADD SET_ADD
 #define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE
 #define _SET_UPDATE SET_UPDATE
-#define _START_DYNAMIC_EXECUTOR 528
-#define _START_EXECUTOR 529
-#define _STORE_ATTR 530
-#define _STORE_ATTR_INSTANCE_VALUE 531
-#define _STORE_ATTR_SLOT 532
-#define _STORE_ATTR_WITH_HINT 533
+#define _START_EXECUTOR 527
+#define _STORE_ATTR 528
+#define _STORE_ATTR_INSTANCE_VALUE 529
+#define _STORE_ATTR_SLOT 530
+#define _STORE_ATTR_WITH_HINT 531
 #define _STORE_DEREF STORE_DEREF
-#define _STORE_FAST 534
-#define _STORE_FAST_0 535
-#define _STORE_FAST_1 536
-#define _STORE_FAST_2 537
-#define _STORE_FAST_3 538
-#define _STORE_FAST_4 539
-#define _STORE_FAST_5 540
-#define _STORE_FAST_6 541
-#define _STORE_FAST_7 542
+#define _STORE_FAST 532
+#define _STORE_FAST_0 533
+#define _STORE_FAST_1 534
+#define _STORE_FAST_2 535
+#define _STORE_FAST_3 536
+#define _STORE_FAST_4 537
+#define _STORE_FAST_5 538
+#define _STORE_FAST_6 539
+#define _STORE_FAST_7 540
 #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 543
-#define _STORE_SUBSCR 544
-#define _STORE_SUBSCR_DICT 545
-#define _STORE_SUBSCR_LIST_INT 546
-#define _SWAP 547
-#define _SWAP_2 548
-#define _SWAP_3 549
-#define _TIER2_RESUME_CHECK 550
-#define _TO_BOOL 551
+#define _STORE_SLICE 541
+#define _STORE_SUBSCR 542
+#define _STORE_SUBSCR_DICT 543
+#define _STORE_SUBSCR_LIST_INT 544
+#define _SWAP 545
+#define _SWAP_2 546
+#define _SWAP_3 547
+#define _TIER2_RESUME_CHECK 548
+#define _TO_BOOL 549
 #define _TO_BOOL_BOOL TO_BOOL_BOOL
 #define _TO_BOOL_INT TO_BOOL_INT
-#define _TO_BOOL_LIST 552
+#define _TO_BOOL_LIST 550
 #define _TO_BOOL_NONE TO_BOOL_NONE
-#define _TO_BOOL_STR 553
+#define _TO_BOOL_STR 551
 #define _UNARY_INVERT UNARY_INVERT
 #define _UNARY_NEGATIVE UNARY_NEGATIVE
 #define _UNARY_NOT UNARY_NOT
 #define _UNPACK_EX UNPACK_EX
-#define _UNPACK_SEQUENCE 554
-#define _UNPACK_SEQUENCE_LIST 555
-#define _UNPACK_SEQUENCE_TUPLE 556
-#define _UNPACK_SEQUENCE_TWO_TUPLE 557
+#define _UNPACK_SEQUENCE 552
+#define _UNPACK_SEQUENCE_LIST 553
+#define _UNPACK_SEQUENCE_TUPLE 554
+#define _UNPACK_SEQUENCE_TWO_TUPLE 555
 #define _WITH_EXCEPT_START WITH_EXCEPT_START
 #define _YIELD_VALUE YIELD_VALUE
-#define MAX_UOP_ID 557
+#define MAX_UOP_ID 555
 
 #ifdef __cplusplus
 }

diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
index bb519f53e34ba9df2872ca850fe533cf8035bc2f..4b033a8b6c2d419fe8c6a6ca1d111b255341e232 100644 (file)
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -316,7 +316,6 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
     [_SAVE_RETURN_OFFSET] = HAS_ARG_FLAG,
     [_EXIT_TRACE] = HAS_ESCAPES_FLAG,
     [_DYNAMIC_EXIT] = HAS_ESCAPES_FLAG,
-    [_DYNAMIC_DEOPT] = 0,
     [_CHECK_VALIDITY] = HAS_DEOPT_FLAG,
     [_LOAD_CONST_INLINE] = HAS_PURE_FLAG,
     [_POP_TOP_LOAD_CONST_INLINE] = HAS_ESCAPES_FLAG | HAS_PURE_FLAG,
@@ -332,7 +331,6 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
     [_LOAD_CONST_UNDER_INLINE] = 0,
     [_LOAD_CONST_UNDER_INLINE_BORROW] = 0,
     [_START_EXECUTOR] = HAS_DEOPT_FLAG,
-    [_START_DYNAMIC_EXECUTOR] = HAS_DEOPT_FLAG,
     [_MAKE_WARM] = 0,
     [_FATAL_ERROR] = 0,
     [_DEOPT] = 0,
@@ -452,7 +450,6 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
     [_DEOPT] = "_DEOPT",
     [_DICT_MERGE] = "_DICT_MERGE",
     [_DICT_UPDATE] = "_DICT_UPDATE",
-    [_DYNAMIC_DEOPT] = "_DYNAMIC_DEOPT",
     [_DYNAMIC_EXIT] = "_DYNAMIC_EXIT",
     [_END_FOR] = "_END_FOR",
     [_END_SEND] = "_END_SEND",
@@ -639,7 +636,6 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
     [_SET_FUNCTION_ATTRIBUTE] = "_SET_FUNCTION_ATTRIBUTE",
     [_SET_IP] = "_SET_IP",
     [_SET_UPDATE] = "_SET_UPDATE",
-    [_START_DYNAMIC_EXECUTOR] = "_START_DYNAMIC_EXECUTOR",
     [_START_EXECUTOR] = "_START_EXECUTOR",
     [_STORE_ATTR] = "_STORE_ATTR",
     [_STORE_ATTR_INSTANCE_VALUE] = "_STORE_ATTR_INSTANCE_VALUE",
@@ -1279,8 +1275,6 @@ int _PyUop_num_popped(int opcode, int oparg)
             return 0;
         case _DYNAMIC_EXIT:
             return 0;
-        case _DYNAMIC_DEOPT:
-            return 0;
         case _CHECK_VALIDITY:
             return 0;
         case _LOAD_CONST_INLINE:
@@ -1311,8 +1305,6 @@ int _PyUop_num_popped(int opcode, int oparg)
             return 1;
         case _START_EXECUTOR:
             return 0;
-        case _START_DYNAMIC_EXECUTOR:
-            return 0;
         case _MAKE_WARM:
             return 0;
         case _FATAL_ERROR:

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 0a45291d4a5d7be56300e879a84263602d9480b8..b57824af37559ac06cef6512a56ddfd98d9a8d3b 100644 (file)
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -5307,10 +5307,6 @@ dummy_func(
             GOTO_TIER_ONE(frame->instr_ptr);
         }
 
-        tier2 op(_DYNAMIC_DEOPT, (--)) {
-            GOTO_TIER_ONE(frame->instr_ptr);
-        }
-
         tier2 op(_CHECK_VALIDITY, (--)) {
             DEOPT_IF(!current_executor->vm_data.valid);
         }
@@ -5410,22 +5406,6 @@ dummy_func(
             }
         }
 
-        tier2 op(_START_DYNAMIC_EXECUTOR, (executor/4 --)) {
-#ifndef _Py_JIT
-            assert(current_executor == (_PyExecutorObject*)executor);
-#endif
-            assert(tstate->jit_exit == NULL || tstate->jit_exit->executor == current_executor);
-            tstate->current_executor = (PyObject *)executor;
-            if (!current_executor->vm_data.valid) {
-                assert(tstate->jit_exit->executor == current_executor);
-                assert(tstate->current_executor == executor);
-                _PyExecutor_ClearExit(tstate->jit_exit);
-                _Py_set_eval_breaker_bit(tstate, _PY_EVAL_JIT_DO_NOT_REENTER);
-                // Note: this points to _DYNAMIC_DEOPT!!!
-                DEOPT_IF(true);
-            }
-        }
-
         tier2 op(_MAKE_WARM, (--)) {
             current_executor->vm_data.warm = true;
         }

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index c6120a346a53f0f0f51e58ccca48e0b7ca1a391f..ada9a486d024d452cfe624dd5846601c61bef061 100644 (file)
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -7152,11 +7152,6 @@
             break;
         }
 
-        case _DYNAMIC_DEOPT: {
-            GOTO_TIER_ONE(frame->instr_ptr);
-            break;
-        }
-
         case _CHECK_VALIDITY: {
             if (!current_executor->vm_data.valid) {
                 UOP_STAT_INC(uopcode, miss);
@@ -7438,28 +7433,6 @@
             break;
         }
 
-        case _START_DYNAMIC_EXECUTOR: {
-            PyObject *executor = (PyObject *)CURRENT_OPERAND0();
-            #ifndef _Py_JIT
-            assert(current_executor == (_PyExecutorObject*)executor);
-            #endif
-            assert(tstate->jit_exit == NULL || tstate->jit_exit->executor == current_executor);
-            tstate->current_executor = (PyObject *)executor;
-            if (!current_executor->vm_data.valid) {
-                assert(tstate->jit_exit->executor == current_executor);
-                assert(tstate->current_executor == executor);
-                _PyFrame_SetStackPointer(frame, stack_pointer);
-                _PyExecutor_ClearExit(tstate->jit_exit);
-                stack_pointer = _PyFrame_GetStackPointer(frame);
-                _Py_set_eval_breaker_bit(tstate, _PY_EVAL_JIT_DO_NOT_REENTER);
-                if (true) {
-                    UOP_STAT_INC(uopcode, miss);
-                    JUMP_TO_JUMP_TARGET();
-                }
-            }
-            break;
-        }
-
         case _MAKE_WARM: {
             current_executor->vm_data.warm = true;
             break;

diff --git a/Python/optimizer.c b/Python/optimizer.c
index 6531cd64bbd675685635ec3514133d631b3ee41a..981482d980a2014a038f25bd2e8583e1ff0da434 100644 (file)
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -1129,7 +1129,7 @@ prepare_for_execution(_PyUOpInstruction *buffer, int length)
             }
         }
         if (opcode == _JUMP_TO_TOP) {
-            assert(buffer[0].opcode == _START_EXECUTOR || buffer[0].opcode == _START_DYNAMIC_EXECUTOR);
+            assert(buffer[0].opcode == _START_EXECUTOR);
             buffer[i].format = UOP_FORMAT_JUMP;
             buffer[i].jump_target = 1;
         }
@@ -1211,8 +1211,7 @@ sanity_check(_PyExecutorObject *executor)
             opcode == _HANDLE_PENDING_AND_DEOPT ||
             opcode == _EXIT_TRACE ||
             opcode == _ERROR_POP_N ||
-            opcode == _DYNAMIC_EXIT ||
-            opcode == _DYNAMIC_DEOPT);
+            opcode == _DYNAMIC_EXIT);
     }
 }
 

diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index 31affc93e7bb7d83b015f310720b9707a86d6118..c12f9af02f873ef3537d3a241e706ccd2391937c 100644 (file)
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -3278,10 +3278,6 @@
             break;
         }
 
-        case _DYNAMIC_DEOPT: {
-            break;
-        }
-
         case _CHECK_VALIDITY: {
             break;
         }
@@ -3407,10 +3403,6 @@
             break;
         }
 
-        case _START_DYNAMIC_EXECUTOR: {
-            break;
-        }
-
         case _MAKE_WARM: {
             break;
         }