Add _GUARD_IP autogenerator

diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
index aa99a0c50406fb3af5e380aa41a1a5c47db7c839..c774807b355961ef97da8e47fdfee589b279c851 100644 (file)
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -1148,7 +1148,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = {
     [END_ASYNC_FOR] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_JUMP_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG | HAS_UNPREDICTABLE_JUMP_FLAG },
     [END_FOR] = { true, INSTR_FMT_IX, HAS_ESCAPES_FLAG | HAS_NO_SAVE_IP_FLAG },
     [END_SEND] = { true, INSTR_FMT_IX, HAS_ESCAPES_FLAG | HAS_PURE_FLAG },
-    [ENTER_EXECUTOR] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
+    [ENTER_EXECUTOR] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
     [EXIT_INIT_CHECK] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG },
     [EXTENDED_ARG] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
     [FORMAT_SIMPLE] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },

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

diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
index 67c5827ffd0c008ddf30d2fb0342686d928ebbed..c7fbfb0fafa2f6b20fbb2cd4675e4591fd91be27 100644 (file)
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -337,9 +337,10 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
     [_ERROR_POP_N] = HAS_ARG_FLAG,
     [_TIER2_RESUME_CHECK] = HAS_PERIODIC_FLAG,
     [_COLD_EXIT] = 0,
-    [_GUARD_IP_PUSH_FRAME] = HAS_EXIT_FLAG,
+    [_GUARD_IP__PUSH_FRAME] = HAS_EXIT_FLAG,
     [_GUARD_IP_YIELD_VALUE] = HAS_EXIT_FLAG,
     [_GUARD_IP_RETURN_VALUE] = HAS_EXIT_FLAG,
+    [_GUARD_IP_RETURN_GENERATOR] = HAS_EXIT_FLAG,
     [_DYNAMIC_EXIT] = HAS_ESCAPES_FLAG,
 };
 
@@ -476,9 +477,10 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
     [_GUARD_DORV_NO_DICT] = "_GUARD_DORV_NO_DICT",
     [_GUARD_DORV_VALUES_INST_ATTR_FROM_DICT] = "_GUARD_DORV_VALUES_INST_ATTR_FROM_DICT",
     [_GUARD_GLOBALS_VERSION] = "_GUARD_GLOBALS_VERSION",
-    [_GUARD_IP_PUSH_FRAME] = "_GUARD_IP_PUSH_FRAME",
+    [_GUARD_IP_RETURN_GENERATOR] = "_GUARD_IP_RETURN_GENERATOR",
     [_GUARD_IP_RETURN_VALUE] = "_GUARD_IP_RETURN_VALUE",
     [_GUARD_IP_YIELD_VALUE] = "_GUARD_IP_YIELD_VALUE",
+    [_GUARD_IP__PUSH_FRAME] = "_GUARD_IP__PUSH_FRAME",
     [_GUARD_IS_FALSE_POP] = "_GUARD_IS_FALSE_POP",
     [_GUARD_IS_NONE_POP] = "_GUARD_IS_NONE_POP",
     [_GUARD_IS_NOT_NONE_POP] = "_GUARD_IS_NOT_NONE_POP",
@@ -1313,12 +1315,14 @@ int _PyUop_num_popped(int opcode, int oparg)
             return 0;
         case _COLD_EXIT:
             return 0;
-        case _GUARD_IP_PUSH_FRAME:
+        case _GUARD_IP__PUSH_FRAME:
             return 0;
         case _GUARD_IP_YIELD_VALUE:
             return 0;
         case _GUARD_IP_RETURN_VALUE:
             return 0;
+        case _GUARD_IP_RETURN_GENERATOR:
+            return 0;
         case _DYNAMIC_EXIT:
             return 0;
         default:

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index d665f7db9c5dda8b6d03443f452e805b0d6c4982..02860122959a4e67048b936ba994902bb98fc1cd 100644 (file)
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2979,18 +2979,15 @@ dummy_func(
                         DISPATCH();
                     }
                 }
-                int _is_sys_tracing = (tstate->c_tracefunc != NULL) || (tstate->c_profilefunc != NULL);
-                if (!_is_sys_tracing) {
-                    /* Back up over EXTENDED_ARGs so executor is inserted at the correct place */
-                    _Py_CODEUNIT *insert_exec_at = this_instr;
-                    while (oparg > 255) {
-                        oparg >>= 8;
-                        insert_exec_at--;
-                    }
-                    int succ = _PyJit_TryInitializeTracing(tstate, frame, this_instr, insert_exec_at, next_instr, STACK_LEVEL(), 0, NULL, NULL, oparg);
-                    if (succ) {
-                        ENTER_TRACING();
-                    }
+                /* Back up over EXTENDED_ARGs so executor is inserted at the correct place */
+                _Py_CODEUNIT *insert_exec_at = this_instr;
+                while (oparg > 255) {
+                    oparg >>= 8;
+                    insert_exec_at--;
+                }
+                int succ = _PyJit_TryInitializeTracing(tstate, frame, this_instr, insert_exec_at, next_instr, STACK_LEVEL(), 0, NULL, NULL, oparg);
+                if (succ) {
+                    ENTER_TRACING();
                 }
             }
             else {
@@ -3036,6 +3033,12 @@ dummy_func(
 
         tier1 inst(ENTER_EXECUTOR, (--)) {
             #ifdef _Py_TIER2
+            if (IS_JIT_TRACING()) {
+                _PyJit_translate_single_bytecode_to_trace(tstate, frame, next_instr);
+                LEAVE_TRACING();
+                int err = bail_tracing_and_jit(tstate, frame);
+                ERROR_IF(err < 0);
+            }
             PyCodeObject *code = _PyFrame_GetCode(frame);
             _PyExecutorObject *executor = code->co_executors->executors[oparg & 255];
             assert(executor->vm_data.index == INSTR_OFFSET() - 1);
@@ -3045,19 +3048,14 @@ dummy_func(
             /* If the eval breaker is set then stay in tier 1.
              * This avoids any potentially infinite loops
              * involving _RESUME_CHECK */
-            if (IS_JIT_TRACING() || _Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) & _PY_EVAL_EVENTS_MASK) {
+            if (_Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) & _PY_EVAL_EVENTS_MASK) {
                 opcode = executor->vm_data.opcode;
                 oparg = (oparg & ~255) | executor->vm_data.oparg;
                 next_instr = this_instr;
                 if (_PyOpcode_Caches[_PyOpcode_Deopt[opcode]]) {
                     PAUSE_ADAPTIVE_COUNTER(this_instr[1].counter);
                 }
-                if (IS_JIT_TRACING()) {
-                    DISPATCH_GOTO_NON_TRACING();
-                }
-                else {
-                    DISPATCH_GOTO();
-                }
+                DISPATCH_GOTO();
             }
             assert(executor != tstate->interp->cold_executor);
             tstate->jit_exit = NULL;
@@ -5454,22 +5452,24 @@ dummy_func(
             TIER2_TO_TIER2(exit->executor);
         }
 
-        tier2 op(_GUARD_IP_PUSH_FRAME, (ip/4 --)) {
-            EXIT_IF(frame->instr_ptr != (_Py_CODEUNIT *)ip);
+        tier2 op(_GUARD_IP__PUSH_FRAME, (ip/4 --)) {
+            // Implementation automatically inserted by Tools/cases/tier2_generator.py
+            EXIT_IF(true);
         }
 
         tier2 op(_GUARD_IP_YIELD_VALUE, (ip/4 --)) {
-            if (frame->instr_ptr + 1 + INLINE_CACHE_ENTRIES_SEND != (_Py_CODEUNIT *)ip) {
-                frame->instr_ptr += 1 + INLINE_CACHE_ENTRIES_SEND;
-                EXIT_IF(true);
-            }
+            // Implementation automatically inserted by Tools/cases/tier2_generator.py
+            EXIT_IF(true);
         }
 
         tier2 op(_GUARD_IP_RETURN_VALUE, (ip/4 --)) {
-            if (frame->instr_ptr + frame->return_offset != (_Py_CODEUNIT *)ip) {
-                frame->instr_ptr += frame->return_offset;
-                EXIT_IF(true);
-            }
+            // Implementation automatically inserted by Tools/cases/tier2_generator.py
+            EXIT_IF(true);
+        }
+
+        tier2 op(_GUARD_IP_RETURN_GENERATOR, (ip/4 --)) {
+            // Implementation automatically inserted by Tools/cases/tier2_generator.py
+            EXIT_IF(true);
         }
 
         // Note: this is different than _COLD_EXIT/_EXIT_TRACE, as it may lead to multiple executors

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 62ddb22a4b0b52b65ad920244bc040faa06f19f3..1534dd6995f6cbd85f40cfcf8a13efe7ef017534 100644 (file)
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -7492,39 +7492,6 @@
             break;
         }
 
-        case _GUARD_IP_PUSH_FRAME: {
-            PyObject *ip = (PyObject *)CURRENT_OPERAND0();
-            if (frame->instr_ptr != (_Py_CODEUNIT *)ip) {
-                UOP_STAT_INC(uopcode, miss);
-                JUMP_TO_JUMP_TARGET();
-            }
-            break;
-        }
-
-        case _GUARD_IP_YIELD_VALUE: {
-            PyObject *ip = (PyObject *)CURRENT_OPERAND0();
-            if (frame->instr_ptr + 1 + INLINE_CACHE_ENTRIES_SEND != (_Py_CODEUNIT *)ip) {
-                frame->instr_ptr += 1 + INLINE_CACHE_ENTRIES_SEND;
-                if (true) {
-                    UOP_STAT_INC(uopcode, miss);
-                    JUMP_TO_JUMP_TARGET();
-                }
-            }
-            break;
-        }
-
-        case _GUARD_IP_RETURN_VALUE: {
-            PyObject *ip = (PyObject *)CURRENT_OPERAND0();
-            if (frame->instr_ptr + frame->return_offset != (_Py_CODEUNIT *)ip) {
-                frame->instr_ptr += frame->return_offset;
-                if (true) {
-                    UOP_STAT_INC(uopcode, miss);
-                    JUMP_TO_JUMP_TARGET();
-                }
-            }
-            break;
-        }
-
         case _DYNAMIC_EXIT: {
             PyObject *exit_p = (PyObject *)CURRENT_OPERAND0();
             _Py_CODEUNIT *target = frame->instr_ptr;
@@ -7554,4 +7521,44 @@
             break;
         }
 
+        case _GUARD_IP_RETURN_VALUE: {
+            PyObject *ip = (PyObject *)CURRENT_OPERAND0();
+            if (frame->instr_ptr + (frame->return_offset) != (_Py_CODEUNIT *)ip) {
+                frame->instr_ptr += (frame->return_offset);
+                UOP_STAT_INC(uopcode, miss);
+                JUMP_TO_JUMP_TARGET();
+            }
+            break;
+        }
+
+        case _GUARD_IP_YIELD_VALUE: {
+            PyObject *ip = (PyObject *)CURRENT_OPERAND0();
+            if (frame->instr_ptr + (1+INLINE_CACHE_ENTRIES_SEND) != (_Py_CODEUNIT *)ip) {
+                frame->instr_ptr += (1+INLINE_CACHE_ENTRIES_SEND);
+                UOP_STAT_INC(uopcode, miss);
+                JUMP_TO_JUMP_TARGET();
+            }
+            break;
+        }
+
+        case _GUARD_IP__PUSH_FRAME: {
+            PyObject *ip = (PyObject *)CURRENT_OPERAND0();
+            if (frame->instr_ptr + (0) != (_Py_CODEUNIT *)ip) {
+                frame->instr_ptr += (0);
+                UOP_STAT_INC(uopcode, miss);
+                JUMP_TO_JUMP_TARGET();
+            }
+            break;
+        }
+
+        case _GUARD_IP_RETURN_GENERATOR: {
+            PyObject *ip = (PyObject *)CURRENT_OPERAND0();
+            if (frame->instr_ptr + (frame->return_offset) != (_Py_CODEUNIT *)ip) {
+                frame->instr_ptr += (frame->return_offset);
+                UOP_STAT_INC(uopcode, miss);
+                JUMP_TO_JUMP_TARGET();
+            }
+            break;
+        }
+
 #undef TIER_TWO

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 10a1793ad284cba8ab01f23fce48017a8d287350..5832fbf029db41f129ba4aadaae9493a07ff836f 100644 (file)
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -5491,25 +5491,32 @@
             INSTRUCTION_STATS(ENTER_EXECUTOR);
             opcode = ENTER_EXECUTOR;
             #ifdef _Py_TIER2
+            if (IS_JIT_TRACING()) {
+                _PyFrame_SetStackPointer(frame, stack_pointer);
+                _PyJit_translate_single_bytecode_to_trace(tstate, frame, next_instr);
+                stack_pointer = _PyFrame_GetStackPointer(frame);
+                LEAVE_TRACING();
+                _PyFrame_SetStackPointer(frame, stack_pointer);
+                int err = bail_tracing_and_jit(tstate, frame);
+                stack_pointer = _PyFrame_GetStackPointer(frame);
+                if (err < 0) {
+                    JUMP_TO_LABEL(error);
+                }
+            }
             PyCodeObject *code = _PyFrame_GetCode(frame);
             _PyExecutorObject *executor = code->co_executors->executors[oparg & 255];
             assert(executor->vm_data.index == INSTR_OFFSET() - 1);
             assert(executor->vm_data.code == code);
             assert(executor->vm_data.valid);
             assert(tstate->current_executor == NULL);
-            if (IS_JIT_TRACING() || _Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) & _PY_EVAL_EVENTS_MASK) {
+            if (_Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) & _PY_EVAL_EVENTS_MASK) {
                 opcode = executor->vm_data.opcode;
                 oparg = (oparg & ~255) | executor->vm_data.oparg;
                 next_instr = this_instr;
                 if (_PyOpcode_Caches[_PyOpcode_Deopt[opcode]]) {
                     PAUSE_ADAPTIVE_COUNTER(this_instr[1].counter);
                 }
-                if (IS_JIT_TRACING()) {
-                    DISPATCH_GOTO_NON_TRACING();
-                }
-                else {
-                    DISPATCH_GOTO();
-                }
+                DISPATCH_GOTO();
             }
             assert(executor != tstate->interp->cold_executor);
             tstate->jit_exit = NULL;
@@ -7704,17 +7711,14 @@
                             DISPATCH();
                         }
                     }
-                    int _is_sys_tracing = (tstate->c_tracefunc != NULL) || (tstate->c_profilefunc != NULL);
-                    if (!_is_sys_tracing) {
-                        _Py_CODEUNIT *insert_exec_at = this_instr;
-                        while (oparg > 255) {
-                            oparg >>= 8;
-                            insert_exec_at--;
-                        }
-                        int succ = _PyJit_TryInitializeTracing(tstate, frame, this_instr, insert_exec_at, next_instr, STACK_LEVEL(), 0, NULL, NULL, oparg);
-                        if (succ) {
-                            ENTER_TRACING();
-                        }
+                    _Py_CODEUNIT *insert_exec_at = this_instr;
+                    while (oparg > 255) {
+                        oparg >>= 8;
+                        insert_exec_at--;
+                    }
+                    int succ = _PyJit_TryInitializeTracing(tstate, frame, this_instr, insert_exec_at, next_instr, STACK_LEVEL(), 0, NULL, NULL, oparg);
+                    if (succ) {
+                        ENTER_TRACING();
                     }
                 }
                 else {

diff --git a/Python/optimizer.c b/Python/optimizer.c
index a3ae74fd944ae834e6341601054c5b60ed4d5356..d11108dcddfb9323a79e4268d36ef4e40a132b52 100644 (file)
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -887,9 +887,11 @@ _PyJit_translate_single_bytecode_to_trace(
     if (needs_guard_ip) {
         switch (trace[trace_length-1].opcode) {
             case _PUSH_FRAME:
-                ADD_TO_TRACE(_GUARD_IP_PUSH_FRAME, 0, (uintptr_t)next_instr, 0);
+                ADD_TO_TRACE(_GUARD_IP__PUSH_FRAME, 0, (uintptr_t)next_instr, 0);
                 break;
             case _RETURN_GENERATOR:
+                ADD_TO_TRACE(_GUARD_IP_RETURN_GENERATOR, 0, (uintptr_t)next_instr, 0);
+                break;
             case _RETURN_VALUE:
                 ADD_TO_TRACE(_GUARD_IP_RETURN_VALUE, 0, (uintptr_t)next_instr, 0);
                 break;
@@ -1077,9 +1079,11 @@ prepare_for_execution(_PyUOpInstruction *buffer, int length)
                 exit_op = _DYNAMIC_EXIT;
             }
             else if (
-                opcode == _GUARD_IP_PUSH_FRAME ||
+                opcode == _GUARD_IP__PUSH_FRAME ||
                 opcode == _GUARD_IP_RETURN_VALUE ||
-                opcode == _GUARD_IP_YIELD_VALUE) {
+                opcode == _GUARD_IP_YIELD_VALUE ||
+                opcode == _GUARD_IP_RETURN_GENERATOR
+            ) {
                 exit_op = _DYNAMIC_EXIT;
                 unique_target = true;
             }
@@ -1565,15 +1569,11 @@ _Py_ExecutorDetach(_PyExecutorObject *executor)
         return;
     }
     _Py_CODEUNIT *instruction = &_PyCode_CODE(code)[executor->vm_data.index];
+    assert(instruction->op.code == ENTER_EXECUTOR);
     int index = instruction->op.arg;
-    // Due to a combination of re-entrancy and tracing, it's possible for an
-    // instruction to no longer be ENTER_EXECUTOR. In which case, no-op.
-    if (instruction->op.code == ENTER_EXECUTOR) {
-        assert(instruction->op.code == ENTER_EXECUTOR);
-        assert(code->co_executors->executors[index] == executor);
-        instruction->op.code = executor->vm_data.opcode;
-        instruction->op.arg = executor->vm_data.oparg;
-    }
+    assert(code->co_executors->executors[index] == executor);
+    instruction->op.code = executor->vm_data.opcode;
+    instruction->op.arg = executor->vm_data.oparg;
     executor->vm_data.code = NULL;
     code->co_executors->executors[index] = NULL;
     Py_DECREF(executor);

diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index 9fc77dd4b6ed0ca3575eaddf1529d2950051fea3..d26803e97d3257a2cd1d4a26be52800bfde5d0e9 100644 (file)
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -3426,7 +3426,7 @@
             break;
         }
 
-        case _GUARD_IP_PUSH_FRAME: {
+        case _GUARD_IP__PUSH_FRAME: {
             break;
         }
 
@@ -3438,6 +3438,10 @@
             break;
         }
 
+        case _GUARD_IP_RETURN_GENERATOR: {
+            break;
+        }
+
         case _DYNAMIC_EXIT: {
             break;
         }

diff --git a/Tools/cases_generator/tier2_generator.py b/Tools/cases_generator/tier2_generator.py
index 4bf04154df16236b880f4afeb97c879ae8933f5a..64f034746f6897164cca215ef21fdff9afa4bf2a 100644 (file)
--- a/Tools/cases_generator/tier2_generator.py
+++ b/Tools/cases_generator/tier2_generator.py
@@ -200,6 +200,33 @@ def write_uop(uop: Uop, emitter: Emitter, stack: Stack) -> Stack:
 SKIPS = ("_EXTENDED_ARG",)
 
 
+def generate_guard_ips(
+    analysis: Analysis,
+    emitter: Tier2Emitter,
+) -> None:
+    for name, uop in analysis.uops.items():
+        for stmt in uop.body.body:
+            tkn_iter = iter(stmt.tokens())
+            for token in tkn_iter:
+                if token.kind == "IDENTIFIER" and token.text == "LOAD_IP":
+                    offset = []
+                    while token.kind != "SEMI":
+                        offset.append(token.text)
+                        token = next(tkn_iter)
+                    # 1: to remove the LOAD_IP text
+                    offset_str = "".join(offset[1:])
+                    emitter.emit(f"case _GUARD_IP_{name}: {{\n")
+                    emitter.emit("PyObject *ip = (PyObject *)CURRENT_OPERAND0();\n")
+                    emitter.emit(f"if (frame->instr_ptr + {offset_str} != (_Py_CODEUNIT *)ip) {{\n")
+                    emitter.emit(f"frame->instr_ptr += {offset_str};\n")
+                    emitter.emit(f"UOP_STAT_INC(uopcode, miss);\n")
+                    emitter.emit("JUMP_TO_JUMP_TARGET();\n")
+                    emitter.emit("}\n")
+                    emitter.emit("break;\n")
+                    emitter.emit("}\n")
+                    emitter.emit("\n")
+
+
 def generate_tier2(
     filenames: list[str], analysis: Analysis, outfile: TextIO, lines: bool
 ) -> None:
@@ -220,6 +247,8 @@ def generate_tier2(
             continue
         if uop.is_super():
             continue
+        if name.startswith("_GUARD_IP"):
+            continue
         why_not_viable = uop.why_not_viable()
         if why_not_viable is not None:
             out.emit(
@@ -236,6 +265,8 @@ def generate_tier2(
         out.start_line()
         out.emit("}")
         out.emit("\n\n")
+
+    generate_guard_ips(analysis, emitter)
     outfile.write("#undef TIER_TWO\n")