#define INLINE_CACHE_ENTRIES_TO_BOOL CACHE_ENTRIES(_PyToBoolCache)
+typedef struct {
+ uint16_t counter;
+} _PyContainsOpCache;
+
+#define INLINE_CACHE_ENTRIES_CONTAINS_OP CACHE_ENTRIES(_PyContainsOpCache)
+
// Borrowed references to common callables:
struct callable_cache {
PyObject *isinstance;
extern void _Py_Specialize_ForIter(PyObject *iter, _Py_CODEUNIT *instr, int oparg);
extern void _Py_Specialize_Send(PyObject *receiver, _Py_CODEUNIT *instr);
extern void _Py_Specialize_ToBool(PyObject *value, _Py_CODEUNIT *instr);
+extern void _Py_Specialize_ContainsOp(PyObject *value, _Py_CODEUNIT *instr);
/* Finalizer function for static codeobjects used in deepfreeze.py */
extern void _PyStaticCode_Fini(PyCodeObject *co);
PyAPI_FUNC(PyObject *)_PyList_FromArraySteal(PyObject *const *src, Py_ssize_t n);
+PyAPI_FUNC(int) _PyList_Contains(PyObject *aa, PyObject *el);
+
#ifdef __cplusplus
}
#endif
return 2;
case CONTAINS_OP:
return 2;
+ case CONTAINS_OP_DICT:
+ return 2;
+ case CONTAINS_OP_LIST:
+ return 2;
+ case CONTAINS_OP_SET:
+ return 2;
+ case CONTAINS_OP_STR:
+ return 2;
+ case CONTAINS_OP_TUPLE:
+ return 2;
case CONVERT_VALUE:
return 1;
case COPY:
return 1;
case CONTAINS_OP:
return 1;
+ case CONTAINS_OP_DICT:
+ return 1;
+ case CONTAINS_OP_LIST:
+ return 1;
+ case CONTAINS_OP_SET:
+ return 1;
+ case CONTAINS_OP_STR:
+ return 1;
+ case CONTAINS_OP_TUPLE:
+ return 1;
case CONVERT_VALUE:
return 1;
case COPY:
[COMPARE_OP_FLOAT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
[COMPARE_OP_INT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
[COMPARE_OP_STR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
- [CONTAINS_OP] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
+ [CONTAINS_OP] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
+ [CONTAINS_OP_DICT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
+ [CONTAINS_OP_LIST] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
+ [CONTAINS_OP_SET] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
+ [CONTAINS_OP_STR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
+ [CONTAINS_OP_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[CONVERT_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG },
[COPY] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_PURE_FLAG },
[COPY_FREE_VARS] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
[COMPARE_OP_INT] = { .nuops = 2, .uops = { { _GUARD_BOTH_INT, 0, 0 }, { _COMPARE_OP_INT, 0, 0 } } },
[COMPARE_OP_STR] = { .nuops = 2, .uops = { { _GUARD_BOTH_UNICODE, 0, 0 }, { _COMPARE_OP_STR, 0, 0 } } },
[CONTAINS_OP] = { .nuops = 1, .uops = { { _CONTAINS_OP, 0, 0 } } },
+ [CONTAINS_OP_DICT] = { .nuops = 1, .uops = { { _CONTAINS_OP_DICT, 0, 0 } } },
+ [CONTAINS_OP_LIST] = { .nuops = 1, .uops = { { _CONTAINS_OP_LIST, 0, 0 } } },
+ [CONTAINS_OP_SET] = { .nuops = 1, .uops = { { _CONTAINS_OP_SET, 0, 0 } } },
+ [CONTAINS_OP_STR] = { .nuops = 1, .uops = { { _CONTAINS_OP_STR, 0, 0 } } },
+ [CONTAINS_OP_TUPLE] = { .nuops = 1, .uops = { { _CONTAINS_OP_TUPLE, 0, 0 } } },
[CONVERT_VALUE] = { .nuops = 1, .uops = { { _CONVERT_VALUE, 0, 0 } } },
[COPY] = { .nuops = 1, .uops = { { _COPY, 0, 0 } } },
[COPY_FREE_VARS] = { .nuops = 1, .uops = { { _COPY_FREE_VARS, 0, 0 } } },
[COMPARE_OP_INT] = "COMPARE_OP_INT",
[COMPARE_OP_STR] = "COMPARE_OP_STR",
[CONTAINS_OP] = "CONTAINS_OP",
+ [CONTAINS_OP_DICT] = "CONTAINS_OP_DICT",
+ [CONTAINS_OP_LIST] = "CONTAINS_OP_LIST",
+ [CONTAINS_OP_SET] = "CONTAINS_OP_SET",
+ [CONTAINS_OP_STR] = "CONTAINS_OP_STR",
+ [CONTAINS_OP_TUPLE] = "CONTAINS_OP_TUPLE",
[CONVERT_VALUE] = "CONVERT_VALUE",
[COPY] = "COPY",
[COPY_FREE_VARS] = "COPY_FREE_VARS",
[LOAD_SUPER_ATTR] = 1,
[LOAD_ATTR] = 9,
[COMPARE_OP] = 1,
+ [CONTAINS_OP] = 1,
[POP_JUMP_IF_TRUE] = 1,
[POP_JUMP_IF_FALSE] = 1,
[POP_JUMP_IF_NONE] = 1,
[COMPARE_OP_INT] = COMPARE_OP,
[COMPARE_OP_STR] = COMPARE_OP,
[CONTAINS_OP] = CONTAINS_OP,
+ [CONTAINS_OP_DICT] = CONTAINS_OP,
+ [CONTAINS_OP_LIST] = CONTAINS_OP,
+ [CONTAINS_OP_SET] = CONTAINS_OP,
+ [CONTAINS_OP_STR] = CONTAINS_OP,
+ [CONTAINS_OP_TUPLE] = CONTAINS_OP,
[CONVERT_VALUE] = CONVERT_VALUE,
[COPY] = COPY,
[COPY_FREE_VARS] = COPY_FREE_VARS,
case 146: \
case 147: \
case 148: \
- case 219: \
- case 220: \
- case 221: \
- case 222: \
- case 223: \
case 224: \
case 225: \
case 226: \
// Export for the gdb plugin's (python-gdb.py) benefit
PyAPI_DATA(PyObject *) _PySet_Dummy;
+PyAPI_FUNC(int) _PySet_Contains(PySetObject *so, PyObject *key);
+
#ifdef __cplusplus
}
#endif
PyTupleObject *it_seq; /* Set to NULL when iterator is exhausted */
} _PyTupleIterObject;
+PyAPI_FUNC(int) _PyTuple_Contains(PyTupleObject *a, PyObject *el);
+
#ifdef __cplusplus
}
#endif
#define _COMPARE_OP_FLOAT 326
#define _COMPARE_OP_INT 327
#define _COMPARE_OP_STR 328
-#define _CONTAINS_OP CONTAINS_OP
+#define _CONTAINS_OP 329
+#define _CONTAINS_OP_DICT CONTAINS_OP_DICT
+#define _CONTAINS_OP_LIST CONTAINS_OP_LIST
+#define _CONTAINS_OP_SET CONTAINS_OP_SET
+#define _CONTAINS_OP_STR CONTAINS_OP_STR
+#define _CONTAINS_OP_TUPLE CONTAINS_OP_TUPLE
#define _CONVERT_VALUE CONVERT_VALUE
#define _COPY COPY
#define _COPY_FREE_VARS COPY_FREE_VARS
#define _DICT_UPDATE DICT_UPDATE
#define _END_SEND END_SEND
#define _EXIT_INIT_CHECK EXIT_INIT_CHECK
-#define _FATAL_ERROR 329
+#define _FATAL_ERROR 330
#define _FORMAT_SIMPLE FORMAT_SIMPLE
#define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC
-#define _FOR_ITER 330
+#define _FOR_ITER 331
#define _FOR_ITER_GEN FOR_ITER_GEN
-#define _FOR_ITER_TIER_TWO 331
+#define _FOR_ITER_TIER_TWO 332
#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 332
-#define _GUARD_BOTH_INT 333
-#define _GUARD_BOTH_UNICODE 334
-#define _GUARD_BUILTINS_VERSION 335
-#define _GUARD_DORV_VALUES 336
-#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 337
-#define _GUARD_GLOBALS_VERSION 338
-#define _GUARD_IS_FALSE_POP 339
-#define _GUARD_IS_NONE_POP 340
-#define _GUARD_IS_NOT_NONE_POP 341
-#define _GUARD_IS_TRUE_POP 342
-#define _GUARD_KEYS_VERSION 343
-#define _GUARD_NOT_EXHAUSTED_LIST 344
-#define _GUARD_NOT_EXHAUSTED_RANGE 345
-#define _GUARD_NOT_EXHAUSTED_TUPLE 346
-#define _GUARD_TYPE_VERSION 347
-#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 348
-#define _INIT_CALL_PY_EXACT_ARGS 349
-#define _INIT_CALL_PY_EXACT_ARGS_0 350
-#define _INIT_CALL_PY_EXACT_ARGS_1 351
-#define _INIT_CALL_PY_EXACT_ARGS_2 352
-#define _INIT_CALL_PY_EXACT_ARGS_3 353
-#define _INIT_CALL_PY_EXACT_ARGS_4 354
+#define _GUARD_BOTH_FLOAT 333
+#define _GUARD_BOTH_INT 334
+#define _GUARD_BOTH_UNICODE 335
+#define _GUARD_BUILTINS_VERSION 336
+#define _GUARD_DORV_VALUES 337
+#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 338
+#define _GUARD_GLOBALS_VERSION 339
+#define _GUARD_IS_FALSE_POP 340
+#define _GUARD_IS_NONE_POP 341
+#define _GUARD_IS_NOT_NONE_POP 342
+#define _GUARD_IS_TRUE_POP 343
+#define _GUARD_KEYS_VERSION 344
+#define _GUARD_NOT_EXHAUSTED_LIST 345
+#define _GUARD_NOT_EXHAUSTED_RANGE 346
+#define _GUARD_NOT_EXHAUSTED_TUPLE 347
+#define _GUARD_TYPE_VERSION 348
+#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 349
+#define _INIT_CALL_PY_EXACT_ARGS 350
+#define _INIT_CALL_PY_EXACT_ARGS_0 351
+#define _INIT_CALL_PY_EXACT_ARGS_1 352
+#define _INIT_CALL_PY_EXACT_ARGS_2 353
+#define _INIT_CALL_PY_EXACT_ARGS_3 354
+#define _INIT_CALL_PY_EXACT_ARGS_4 355
#define _INSTRUMENTED_CALL INSTRUMENTED_CALL
#define _INSTRUMENTED_CALL_FUNCTION_EX INSTRUMENTED_CALL_FUNCTION_EX
#define _INSTRUMENTED_CALL_KW INSTRUMENTED_CALL_KW
#define _INSTRUMENTED_RETURN_CONST INSTRUMENTED_RETURN_CONST
#define _INSTRUMENTED_RETURN_VALUE INSTRUMENTED_RETURN_VALUE
#define _INSTRUMENTED_YIELD_VALUE INSTRUMENTED_YIELD_VALUE
-#define _INTERNAL_INCREMENT_OPT_COUNTER 355
-#define _IS_NONE 356
+#define _INTERNAL_INCREMENT_OPT_COUNTER 356
+#define _IS_NONE 357
#define _IS_OP IS_OP
-#define _ITER_CHECK_LIST 357
-#define _ITER_CHECK_RANGE 358
-#define _ITER_CHECK_TUPLE 359
-#define _ITER_JUMP_LIST 360
-#define _ITER_JUMP_RANGE 361
-#define _ITER_JUMP_TUPLE 362
-#define _ITER_NEXT_LIST 363
-#define _ITER_NEXT_RANGE 364
-#define _ITER_NEXT_TUPLE 365
-#define _JUMP_TO_TOP 366
+#define _ITER_CHECK_LIST 358
+#define _ITER_CHECK_RANGE 359
+#define _ITER_CHECK_TUPLE 360
+#define _ITER_JUMP_LIST 361
+#define _ITER_JUMP_RANGE 362
+#define _ITER_JUMP_TUPLE 363
+#define _ITER_NEXT_LIST 364
+#define _ITER_NEXT_RANGE 365
+#define _ITER_NEXT_TUPLE 366
+#define _JUMP_TO_TOP 367
#define _LIST_APPEND LIST_APPEND
#define _LIST_EXTEND LIST_EXTEND
#define _LOAD_ASSERTION_ERROR LOAD_ASSERTION_ERROR
-#define _LOAD_ATTR 367
-#define _LOAD_ATTR_CLASS 368
-#define _LOAD_ATTR_CLASS_0 369
-#define _LOAD_ATTR_CLASS_1 370
+#define _LOAD_ATTR 368
+#define _LOAD_ATTR_CLASS 369
+#define _LOAD_ATTR_CLASS_0 370
+#define _LOAD_ATTR_CLASS_1 371
#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN
-#define _LOAD_ATTR_INSTANCE_VALUE 371
-#define _LOAD_ATTR_INSTANCE_VALUE_0 372
-#define _LOAD_ATTR_INSTANCE_VALUE_1 373
-#define _LOAD_ATTR_METHOD_LAZY_DICT 374
-#define _LOAD_ATTR_METHOD_NO_DICT 375
-#define _LOAD_ATTR_METHOD_WITH_VALUES 376
-#define _LOAD_ATTR_MODULE 377
-#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 378
-#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 379
+#define _LOAD_ATTR_INSTANCE_VALUE 372
+#define _LOAD_ATTR_INSTANCE_VALUE_0 373
+#define _LOAD_ATTR_INSTANCE_VALUE_1 374
+#define _LOAD_ATTR_METHOD_LAZY_DICT 375
+#define _LOAD_ATTR_METHOD_NO_DICT 376
+#define _LOAD_ATTR_METHOD_WITH_VALUES 377
+#define _LOAD_ATTR_MODULE 378
+#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 379
+#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 380
#define _LOAD_ATTR_PROPERTY LOAD_ATTR_PROPERTY
-#define _LOAD_ATTR_SLOT 380
-#define _LOAD_ATTR_SLOT_0 381
-#define _LOAD_ATTR_SLOT_1 382
-#define _LOAD_ATTR_WITH_HINT 383
+#define _LOAD_ATTR_SLOT 381
+#define _LOAD_ATTR_SLOT_0 382
+#define _LOAD_ATTR_SLOT_1 383
+#define _LOAD_ATTR_WITH_HINT 384
#define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS
#define _LOAD_CONST LOAD_CONST
-#define _LOAD_CONST_INLINE 384
-#define _LOAD_CONST_INLINE_BORROW 385
-#define _LOAD_CONST_INLINE_BORROW_WITH_NULL 386
-#define _LOAD_CONST_INLINE_WITH_NULL 387
+#define _LOAD_CONST_INLINE 385
+#define _LOAD_CONST_INLINE_BORROW 386
+#define _LOAD_CONST_INLINE_BORROW_WITH_NULL 387
+#define _LOAD_CONST_INLINE_WITH_NULL 388
#define _LOAD_DEREF LOAD_DEREF
-#define _LOAD_FAST 388
-#define _LOAD_FAST_0 389
-#define _LOAD_FAST_1 390
-#define _LOAD_FAST_2 391
-#define _LOAD_FAST_3 392
-#define _LOAD_FAST_4 393
-#define _LOAD_FAST_5 394
-#define _LOAD_FAST_6 395
-#define _LOAD_FAST_7 396
+#define _LOAD_FAST 389
+#define _LOAD_FAST_0 390
+#define _LOAD_FAST_1 391
+#define _LOAD_FAST_2 392
+#define _LOAD_FAST_3 393
+#define _LOAD_FAST_4 394
+#define _LOAD_FAST_5 395
+#define _LOAD_FAST_6 396
+#define _LOAD_FAST_7 397
#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 397
-#define _LOAD_GLOBAL_BUILTINS 398
-#define _LOAD_GLOBAL_MODULE 399
+#define _LOAD_GLOBAL 398
+#define _LOAD_GLOBAL_BUILTINS 399
+#define _LOAD_GLOBAL_MODULE 400
#define _LOAD_LOCALS LOAD_LOCALS
#define _LOAD_NAME LOAD_NAME
#define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR
#define _MATCH_SEQUENCE MATCH_SEQUENCE
#define _NOP NOP
#define _POP_EXCEPT POP_EXCEPT
-#define _POP_FRAME 400
-#define _POP_JUMP_IF_FALSE 401
-#define _POP_JUMP_IF_TRUE 402
+#define _POP_FRAME 401
+#define _POP_JUMP_IF_FALSE 402
+#define _POP_JUMP_IF_TRUE 403
#define _POP_TOP POP_TOP
-#define _POP_TOP_LOAD_CONST_INLINE_BORROW 403
+#define _POP_TOP_LOAD_CONST_INLINE_BORROW 404
#define _PUSH_EXC_INFO PUSH_EXC_INFO
-#define _PUSH_FRAME 404
+#define _PUSH_FRAME 405
#define _PUSH_NULL PUSH_NULL
-#define _REPLACE_WITH_TRUE 405
+#define _REPLACE_WITH_TRUE 406
#define _RESUME_CHECK RESUME_CHECK
-#define _SAVE_RETURN_OFFSET 406
-#define _SEND 407
+#define _SAVE_RETURN_OFFSET 407
+#define _SEND 408
#define _SEND_GEN SEND_GEN
#define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS
#define _SET_ADD SET_ADD
#define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE
#define _SET_UPDATE SET_UPDATE
-#define _START_EXECUTOR 408
-#define _STORE_ATTR 409
-#define _STORE_ATTR_INSTANCE_VALUE 410
-#define _STORE_ATTR_SLOT 411
+#define _START_EXECUTOR 409
+#define _STORE_ATTR 410
+#define _STORE_ATTR_INSTANCE_VALUE 411
+#define _STORE_ATTR_SLOT 412
#define _STORE_ATTR_WITH_HINT STORE_ATTR_WITH_HINT
#define _STORE_DEREF STORE_DEREF
-#define _STORE_FAST 412
-#define _STORE_FAST_0 413
-#define _STORE_FAST_1 414
-#define _STORE_FAST_2 415
-#define _STORE_FAST_3 416
-#define _STORE_FAST_4 417
-#define _STORE_FAST_5 418
-#define _STORE_FAST_6 419
-#define _STORE_FAST_7 420
+#define _STORE_FAST 413
+#define _STORE_FAST_0 414
+#define _STORE_FAST_1 415
+#define _STORE_FAST_2 416
+#define _STORE_FAST_3 417
+#define _STORE_FAST_4 418
+#define _STORE_FAST_5 419
+#define _STORE_FAST_6 420
+#define _STORE_FAST_7 421
#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 421
+#define _STORE_SUBSCR 422
#define _STORE_SUBSCR_DICT STORE_SUBSCR_DICT
#define _STORE_SUBSCR_LIST_INT STORE_SUBSCR_LIST_INT
#define _SWAP SWAP
-#define _TO_BOOL 422
+#define _TO_BOOL 423
#define _TO_BOOL_BOOL TO_BOOL_BOOL
#define _TO_BOOL_INT TO_BOOL_INT
#define _TO_BOOL_LIST TO_BOOL_LIST
#define _UNARY_NEGATIVE UNARY_NEGATIVE
#define _UNARY_NOT UNARY_NOT
#define _UNPACK_EX UNPACK_EX
-#define _UNPACK_SEQUENCE 423
+#define _UNPACK_SEQUENCE 424
#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 MAX_UOP_ID 423
+#define MAX_UOP_ID 424
#ifdef __cplusplus
}
[_COMPARE_OP_STR] = HAS_ARG_FLAG | HAS_ESCAPES_FLAG,
[_IS_OP] = HAS_ARG_FLAG,
[_CONTAINS_OP] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
+ [_CONTAINS_OP_LIST] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
+ [_CONTAINS_OP_SET] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
+ [_CONTAINS_OP_TUPLE] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
+ [_CONTAINS_OP_DICT] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
+ [_CONTAINS_OP_STR] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CHECK_EG_MATCH] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CHECK_EXC_MATCH] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_IS_NONE] = 0,
[_COMPARE_OP_INT] = "_COMPARE_OP_INT",
[_COMPARE_OP_STR] = "_COMPARE_OP_STR",
[_CONTAINS_OP] = "_CONTAINS_OP",
+ [_CONTAINS_OP_DICT] = "_CONTAINS_OP_DICT",
+ [_CONTAINS_OP_LIST] = "_CONTAINS_OP_LIST",
+ [_CONTAINS_OP_SET] = "_CONTAINS_OP_SET",
+ [_CONTAINS_OP_STR] = "_CONTAINS_OP_STR",
+ [_CONTAINS_OP_TUPLE] = "_CONTAINS_OP_TUPLE",
[_CONVERT_VALUE] = "_CONVERT_VALUE",
[_COPY] = "_COPY",
[_COPY_FREE_VARS] = "_COPY_FREE_VARS",
#define COMPARE_OP_FLOAT 180
#define COMPARE_OP_INT 181
#define COMPARE_OP_STR 182
-#define FOR_ITER_GEN 183
-#define FOR_ITER_LIST 184
-#define FOR_ITER_RANGE 185
-#define FOR_ITER_TUPLE 186
-#define LOAD_ATTR_CLASS 187
-#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 188
-#define LOAD_ATTR_INSTANCE_VALUE 189
-#define LOAD_ATTR_METHOD_LAZY_DICT 190
-#define LOAD_ATTR_METHOD_NO_DICT 191
-#define LOAD_ATTR_METHOD_WITH_VALUES 192
-#define LOAD_ATTR_MODULE 193
-#define LOAD_ATTR_NONDESCRIPTOR_NO_DICT 194
-#define LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 195
-#define LOAD_ATTR_PROPERTY 196
-#define LOAD_ATTR_SLOT 197
-#define LOAD_ATTR_WITH_HINT 198
-#define LOAD_GLOBAL_BUILTIN 199
-#define LOAD_GLOBAL_MODULE 200
-#define LOAD_SUPER_ATTR_ATTR 201
-#define LOAD_SUPER_ATTR_METHOD 202
-#define RESUME_CHECK 203
-#define SEND_GEN 204
-#define STORE_ATTR_INSTANCE_VALUE 205
-#define STORE_ATTR_SLOT 206
-#define STORE_ATTR_WITH_HINT 207
-#define STORE_SUBSCR_DICT 208
-#define STORE_SUBSCR_LIST_INT 209
-#define TO_BOOL_ALWAYS_TRUE 210
-#define TO_BOOL_BOOL 211
-#define TO_BOOL_INT 212
-#define TO_BOOL_LIST 213
-#define TO_BOOL_NONE 214
-#define TO_BOOL_STR 215
-#define UNPACK_SEQUENCE_LIST 216
-#define UNPACK_SEQUENCE_TUPLE 217
-#define UNPACK_SEQUENCE_TWO_TUPLE 218
+#define CONTAINS_OP_DICT 183
+#define CONTAINS_OP_LIST 184
+#define CONTAINS_OP_SET 185
+#define CONTAINS_OP_STR 186
+#define CONTAINS_OP_TUPLE 187
+#define FOR_ITER_GEN 188
+#define FOR_ITER_LIST 189
+#define FOR_ITER_RANGE 190
+#define FOR_ITER_TUPLE 191
+#define LOAD_ATTR_CLASS 192
+#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 193
+#define LOAD_ATTR_INSTANCE_VALUE 194
+#define LOAD_ATTR_METHOD_LAZY_DICT 195
+#define LOAD_ATTR_METHOD_NO_DICT 196
+#define LOAD_ATTR_METHOD_WITH_VALUES 197
+#define LOAD_ATTR_MODULE 198
+#define LOAD_ATTR_NONDESCRIPTOR_NO_DICT 199
+#define LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 200
+#define LOAD_ATTR_PROPERTY 201
+#define LOAD_ATTR_SLOT 202
+#define LOAD_ATTR_WITH_HINT 203
+#define LOAD_GLOBAL_BUILTIN 204
+#define LOAD_GLOBAL_MODULE 205
+#define LOAD_SUPER_ATTR_ATTR 206
+#define LOAD_SUPER_ATTR_METHOD 207
+#define RESUME_CHECK 208
+#define SEND_GEN 209
+#define STORE_ATTR_INSTANCE_VALUE 210
+#define STORE_ATTR_SLOT 211
+#define STORE_ATTR_WITH_HINT 212
+#define STORE_SUBSCR_DICT 213
+#define STORE_SUBSCR_LIST_INT 214
+#define TO_BOOL_ALWAYS_TRUE 215
+#define TO_BOOL_BOOL 216
+#define TO_BOOL_INT 217
+#define TO_BOOL_LIST 218
+#define TO_BOOL_NONE 219
+#define TO_BOOL_STR 220
+#define UNPACK_SEQUENCE_LIST 221
+#define UNPACK_SEQUENCE_TUPLE 222
+#define UNPACK_SEQUENCE_TWO_TUPLE 223
#define INSTRUMENTED_RESUME 236
#define INSTRUMENTED_END_FOR 237
#define INSTRUMENTED_END_SEND 238
"COMPARE_OP_INT",
"COMPARE_OP_STR",
],
+ "CONTAINS_OP": [
+ "CONTAINS_OP_LIST",
+ "CONTAINS_OP_SET",
+ "CONTAINS_OP_TUPLE",
+ "CONTAINS_OP_DICT",
+ "CONTAINS_OP_STR",
+ ],
"FOR_ITER": [
"FOR_ITER_LIST",
"FOR_ITER_TUPLE",
'COMPARE_OP_FLOAT': 180,
'COMPARE_OP_INT': 181,
'COMPARE_OP_STR': 182,
- 'FOR_ITER_GEN': 183,
- 'FOR_ITER_LIST': 184,
- 'FOR_ITER_RANGE': 185,
- 'FOR_ITER_TUPLE': 186,
- 'LOAD_ATTR_CLASS': 187,
- 'LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN': 188,
- 'LOAD_ATTR_INSTANCE_VALUE': 189,
- 'LOAD_ATTR_METHOD_LAZY_DICT': 190,
- 'LOAD_ATTR_METHOD_NO_DICT': 191,
- 'LOAD_ATTR_METHOD_WITH_VALUES': 192,
- 'LOAD_ATTR_MODULE': 193,
- 'LOAD_ATTR_NONDESCRIPTOR_NO_DICT': 194,
- 'LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES': 195,
- 'LOAD_ATTR_PROPERTY': 196,
- 'LOAD_ATTR_SLOT': 197,
- 'LOAD_ATTR_WITH_HINT': 198,
- 'LOAD_GLOBAL_BUILTIN': 199,
- 'LOAD_GLOBAL_MODULE': 200,
- 'LOAD_SUPER_ATTR_ATTR': 201,
- 'LOAD_SUPER_ATTR_METHOD': 202,
- 'RESUME_CHECK': 203,
- 'SEND_GEN': 204,
- 'STORE_ATTR_INSTANCE_VALUE': 205,
- 'STORE_ATTR_SLOT': 206,
- 'STORE_ATTR_WITH_HINT': 207,
- 'STORE_SUBSCR_DICT': 208,
- 'STORE_SUBSCR_LIST_INT': 209,
- 'TO_BOOL_ALWAYS_TRUE': 210,
- 'TO_BOOL_BOOL': 211,
- 'TO_BOOL_INT': 212,
- 'TO_BOOL_LIST': 213,
- 'TO_BOOL_NONE': 214,
- 'TO_BOOL_STR': 215,
- 'UNPACK_SEQUENCE_LIST': 216,
- 'UNPACK_SEQUENCE_TUPLE': 217,
- 'UNPACK_SEQUENCE_TWO_TUPLE': 218,
+ 'CONTAINS_OP_DICT': 183,
+ 'CONTAINS_OP_LIST': 184,
+ 'CONTAINS_OP_SET': 185,
+ 'CONTAINS_OP_STR': 186,
+ 'CONTAINS_OP_TUPLE': 187,
+ 'FOR_ITER_GEN': 188,
+ 'FOR_ITER_LIST': 189,
+ 'FOR_ITER_RANGE': 190,
+ 'FOR_ITER_TUPLE': 191,
+ 'LOAD_ATTR_CLASS': 192,
+ 'LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN': 193,
+ 'LOAD_ATTR_INSTANCE_VALUE': 194,
+ 'LOAD_ATTR_METHOD_LAZY_DICT': 195,
+ 'LOAD_ATTR_METHOD_NO_DICT': 196,
+ 'LOAD_ATTR_METHOD_WITH_VALUES': 197,
+ 'LOAD_ATTR_MODULE': 198,
+ 'LOAD_ATTR_NONDESCRIPTOR_NO_DICT': 199,
+ 'LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES': 200,
+ 'LOAD_ATTR_PROPERTY': 201,
+ 'LOAD_ATTR_SLOT': 202,
+ 'LOAD_ATTR_WITH_HINT': 203,
+ 'LOAD_GLOBAL_BUILTIN': 204,
+ 'LOAD_GLOBAL_MODULE': 205,
+ 'LOAD_SUPER_ATTR_ATTR': 206,
+ 'LOAD_SUPER_ATTR_METHOD': 207,
+ 'RESUME_CHECK': 208,
+ 'SEND_GEN': 209,
+ 'STORE_ATTR_INSTANCE_VALUE': 210,
+ 'STORE_ATTR_SLOT': 211,
+ 'STORE_ATTR_WITH_HINT': 212,
+ 'STORE_SUBSCR_DICT': 213,
+ 'STORE_SUBSCR_LIST_INT': 214,
+ 'TO_BOOL_ALWAYS_TRUE': 215,
+ 'TO_BOOL_BOOL': 216,
+ 'TO_BOOL_INT': 217,
+ 'TO_BOOL_LIST': 218,
+ 'TO_BOOL_NONE': 219,
+ 'TO_BOOL_STR': 220,
+ 'UNPACK_SEQUENCE_LIST': 221,
+ 'UNPACK_SEQUENCE_TUPLE': 222,
+ 'UNPACK_SEQUENCE_TWO_TUPLE': 223,
}
opmap = {
# Python 3.13a1 3566 (Emit JUMP_NO_INTERRUPT instead of JUMP for non-loop no-lineno cases)
# Python 3.13a1 3567 (Reimplement line number propagation by the compiler)
# Python 3.13a1 3568 (Change semantics of END_FOR)
+# Python 3.13a5 3569 (Specialize CONTAINS_OP)
# Python 3.14 will start with 3600
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated.
-MAGIC_NUMBER = (3568).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3569).to_bytes(2, 'little') + b'\r\n'
_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
"COMPARE_OP": {
"counter": 1,
},
+ "CONTAINS_OP": {
+ "counter": 1,
+ },
"BINARY_SUBSCR": {
"counter": 1,
},
--- /dev/null
+Add specialization for ``CONTAINS_OP``.
return PyList_GET_SIZE(a);
}
-static int
-list_contains(PyObject *aa, PyObject *el)
+int
+_PyList_Contains(PyObject *aa, PyObject *el)
{
for (Py_ssize_t i = 0; ; i++) {
0, /* sq_slice */
list_ass_item, /* sq_ass_item */
0, /* sq_ass_slice */
- list_contains, /* sq_contains */
+ _PyList_Contains, /* sq_contains */
list_inplace_concat, /* sq_inplace_concat */
list_inplace_repeat, /* sq_inplace_repeat */
};
Py_RETURN_NONE;
}
-static int
-set_contains(PySetObject *so, PyObject *key)
+int
+_PySet_Contains(PySetObject *so, PyObject *key)
{
PyObject *tmpkey;
int rv;
{
long result;
- result = set_contains(so, key);
+ result = _PySet_Contains(so, key);
if (result < 0)
return NULL;
return PyBool_FromLong(result);
0, /* sq_slice */
0, /* sq_ass_item */
0, /* sq_ass_slice */
- (objobjproc)set_contains, /* sq_contains */
+ (objobjproc)_PySet_Contains, /* sq_contains */
};
/* set object ********************************************************/
return Py_SIZE(a);
}
-static int
-tuplecontains(PyTupleObject *a, PyObject *el)
+int
+_PyTuple_Contains(PyTupleObject *a, PyObject *el)
{
Py_ssize_t i;
int cmp;
0, /* sq_slice */
0, /* sq_ass_item */
0, /* sq_ass_slice */
- (objobjproc)tuplecontains, /* sq_contains */
+ (objobjproc)_PyTuple_Contains, /* sq_contains */
};
static PyObject*
b = res ? Py_True : Py_False;
}
- inst(CONTAINS_OP, (left, right -- b)) {
+ family(CONTAINS_OP, INLINE_CACHE_ENTRIES_CONTAINS_OP) = {
+ CONTAINS_OP_LIST,
+ CONTAINS_OP_SET,
+ CONTAINS_OP_TUPLE,
+ CONTAINS_OP_DICT,
+ CONTAINS_OP_STR,
+ };
+
+ op(_CONTAINS_OP, (left, right -- b)) {
int res = PySequence_Contains(right, left);
DECREF_INPUTS();
ERROR_IF(res < 0, error);
b = (res ^ oparg) ? Py_True : Py_False;
}
+ specializing op(_SPECIALIZE_CONTAINS_OP, (counter/1, left, right -- left, right)) {
+ #if ENABLE_SPECIALIZATION
+ if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
+ next_instr = this_instr;
+ _Py_Specialize_ContainsOp(right, next_instr);
+ DISPATCH_SAME_OPARG();
+ }
+ STAT_INC(CONTAINS_OP, deferred);
+ DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
+ #endif /* ENABLE_SPECIALIZATION */
+ }
+
+ macro(CONTAINS_OP) = _SPECIALIZE_CONTAINS_OP + _CONTAINS_OP;
+
+ inst(CONTAINS_OP_LIST, (unused/1, left, right -- b)) {
+ DEOPT_IF(!PyList_CheckExact(right));
+ int res = _PyList_Contains(right, left);
+ DECREF_INPUTS();
+ ERROR_IF(res < 0, error);
+ b = (res ^ oparg) ? Py_True : Py_False;
+ }
+
+ inst(CONTAINS_OP_SET, (unused/1, left, right -- b)) {
+ DEOPT_IF(!PySet_CheckExact(right));
+ int res = _PySet_Contains((PySetObject *)right, left);
+ DECREF_INPUTS();
+ ERROR_IF(res < 0, error);
+ b = (res ^ oparg) ? Py_True : Py_False;
+ }
+
+ inst(CONTAINS_OP_TUPLE, (unused/1, left, right -- b)) {
+ DEOPT_IF(!PyTuple_CheckExact(right));
+ int res = _PyTuple_Contains((PyTupleObject *)right, left);
+ DECREF_INPUTS();
+ ERROR_IF(res < 0, error);
+ b = (res ^ oparg) ? Py_True : Py_False;
+ }
+
+ inst(CONTAINS_OP_DICT, (unused/1, left, right -- b)) {
+ DEOPT_IF(!PyDict_CheckExact(right));
+ int res = PyDict_Contains(right, left);
+ DECREF_INPUTS();
+ ERROR_IF(res < 0, error);
+ b = (res ^ oparg) ? Py_True : Py_False;
+ }
+
+ inst(CONTAINS_OP_STR, (unused/1, left, right -- b)) {
+ DEOPT_IF(!PyUnicode_CheckExact(right));
+ int res = PyUnicode_Contains(right, left);
+ DECREF_INPUTS();
+ ERROR_IF(res < 0, error);
+ b = (res ^ oparg) ? Py_True : Py_False;
+ }
+
inst(CHECK_EG_MATCH, (exc_value, match_type -- rest, match)) {
if (_PyEval_CheckExceptStarTypeValid(tstate, match_type) < 0) {
DECREF_INPUTS();
break;
}
+ case _CONTAINS_OP_LIST: {
+ PyObject *right;
+ PyObject *left;
+ PyObject *b;
+ oparg = CURRENT_OPARG();
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ if (!PyList_CheckExact(right)) goto deoptimize;
+ int res = _PyList_Contains(right, left);
+ Py_DECREF(left);
+ Py_DECREF(right);
+ if (res < 0) goto pop_2_error_tier_two;
+ b = (res ^ oparg) ? Py_True : Py_False;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ break;
+ }
+
+ case _CONTAINS_OP_SET: {
+ PyObject *right;
+ PyObject *left;
+ PyObject *b;
+ oparg = CURRENT_OPARG();
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ if (!PySet_CheckExact(right)) goto deoptimize;
+ int res = _PySet_Contains((PySetObject *)right, left);
+ Py_DECREF(left);
+ Py_DECREF(right);
+ if (res < 0) goto pop_2_error_tier_two;
+ b = (res ^ oparg) ? Py_True : Py_False;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ break;
+ }
+
+ case _CONTAINS_OP_TUPLE: {
+ PyObject *right;
+ PyObject *left;
+ PyObject *b;
+ oparg = CURRENT_OPARG();
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ if (!PyTuple_CheckExact(right)) goto deoptimize;
+ int res = _PyTuple_Contains((PyTupleObject *)right, left);
+ Py_DECREF(left);
+ Py_DECREF(right);
+ if (res < 0) goto pop_2_error_tier_two;
+ b = (res ^ oparg) ? Py_True : Py_False;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ break;
+ }
+
+ case _CONTAINS_OP_DICT: {
+ PyObject *right;
+ PyObject *left;
+ PyObject *b;
+ oparg = CURRENT_OPARG();
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ if (!PyDict_CheckExact(right)) goto deoptimize;
+ int res = PyDict_Contains(right, left);
+ Py_DECREF(left);
+ Py_DECREF(right);
+ if (res < 0) goto pop_2_error_tier_two;
+ b = (res ^ oparg) ? Py_True : Py_False;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ break;
+ }
+
+ case _CONTAINS_OP_STR: {
+ PyObject *right;
+ PyObject *left;
+ PyObject *b;
+ oparg = CURRENT_OPARG();
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ if (!PyUnicode_CheckExact(right)) goto deoptimize;
+ int res = PyUnicode_Contains(right, left);
+ Py_DECREF(left);
+ Py_DECREF(right);
+ if (res < 0) goto pop_2_error_tier_two;
+ b = (res ^ oparg) ? Py_True : Py_False;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ break;
+ }
+
case _CHECK_EG_MATCH: {
PyObject *match_type;
PyObject *exc_value;
TARGET(CONTAINS_OP) {
frame->instr_ptr = next_instr;
- next_instr += 1;
+ next_instr += 2;
INSTRUCTION_STATS(CONTAINS_OP);
+ PREDICTED(CONTAINS_OP);
+ _Py_CODEUNIT *this_instr = next_instr - 2;
+ (void)this_instr;
+ PyObject *right;
+ PyObject *left;
+ PyObject *b;
+ // _SPECIALIZE_CONTAINS_OP
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ {
+ uint16_t counter = read_u16(&this_instr[1].cache);
+ (void)counter;
+ #if ENABLE_SPECIALIZATION
+ if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
+ next_instr = this_instr;
+ _Py_Specialize_ContainsOp(right, next_instr);
+ DISPATCH_SAME_OPARG();
+ }
+ STAT_INC(CONTAINS_OP, deferred);
+ DECREMENT_ADAPTIVE_COUNTER(this_instr[1].cache);
+ #endif /* ENABLE_SPECIALIZATION */
+ }
+ // _CONTAINS_OP
+ {
+ int res = PySequence_Contains(right, left);
+ Py_DECREF(left);
+ Py_DECREF(right);
+ if (res < 0) goto pop_2_error;
+ b = (res ^ oparg) ? Py_True : Py_False;
+ }
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ DISPATCH();
+ }
+
+ TARGET(CONTAINS_OP_DICT) {
+ frame->instr_ptr = next_instr;
+ next_instr += 2;
+ INSTRUCTION_STATS(CONTAINS_OP_DICT);
+ static_assert(INLINE_CACHE_ENTRIES_CONTAINS_OP == 1, "incorrect cache size");
+ PyObject *right;
+ PyObject *left;
+ PyObject *b;
+ /* Skip 1 cache entry */
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ DEOPT_IF(!PyDict_CheckExact(right), CONTAINS_OP);
+ int res = PyDict_Contains(right, left);
+ Py_DECREF(left);
+ Py_DECREF(right);
+ if (res < 0) goto pop_2_error;
+ b = (res ^ oparg) ? Py_True : Py_False;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ DISPATCH();
+ }
+
+ TARGET(CONTAINS_OP_LIST) {
+ frame->instr_ptr = next_instr;
+ next_instr += 2;
+ INSTRUCTION_STATS(CONTAINS_OP_LIST);
+ static_assert(INLINE_CACHE_ENTRIES_CONTAINS_OP == 1, "incorrect cache size");
+ PyObject *right;
+ PyObject *left;
+ PyObject *b;
+ /* Skip 1 cache entry */
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ DEOPT_IF(!PyList_CheckExact(right), CONTAINS_OP);
+ int res = _PyList_Contains(right, left);
+ Py_DECREF(left);
+ Py_DECREF(right);
+ if (res < 0) goto pop_2_error;
+ b = (res ^ oparg) ? Py_True : Py_False;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ DISPATCH();
+ }
+
+ TARGET(CONTAINS_OP_SET) {
+ frame->instr_ptr = next_instr;
+ next_instr += 2;
+ INSTRUCTION_STATS(CONTAINS_OP_SET);
+ static_assert(INLINE_CACHE_ENTRIES_CONTAINS_OP == 1, "incorrect cache size");
+ PyObject *right;
+ PyObject *left;
+ PyObject *b;
+ /* Skip 1 cache entry */
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ DEOPT_IF(!PySet_CheckExact(right), CONTAINS_OP);
+ int res = _PySet_Contains((PySetObject *)right, left);
+ Py_DECREF(left);
+ Py_DECREF(right);
+ if (res < 0) goto pop_2_error;
+ b = (res ^ oparg) ? Py_True : Py_False;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ DISPATCH();
+ }
+
+ TARGET(CONTAINS_OP_STR) {
+ frame->instr_ptr = next_instr;
+ next_instr += 2;
+ INSTRUCTION_STATS(CONTAINS_OP_STR);
+ static_assert(INLINE_CACHE_ENTRIES_CONTAINS_OP == 1, "incorrect cache size");
PyObject *right;
PyObject *left;
PyObject *b;
+ /* Skip 1 cache entry */
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ DEOPT_IF(!PyUnicode_CheckExact(right), CONTAINS_OP);
+ int res = PyUnicode_Contains(right, left);
+ Py_DECREF(left);
+ Py_DECREF(right);
+ if (res < 0) goto pop_2_error;
+ b = (res ^ oparg) ? Py_True : Py_False;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ DISPATCH();
+ }
+
+ TARGET(CONTAINS_OP_TUPLE) {
+ frame->instr_ptr = next_instr;
+ next_instr += 2;
+ INSTRUCTION_STATS(CONTAINS_OP_TUPLE);
+ static_assert(INLINE_CACHE_ENTRIES_CONTAINS_OP == 1, "incorrect cache size");
+ PyObject *right;
+ PyObject *left;
+ PyObject *b;
+ /* Skip 1 cache entry */
right = stack_pointer[-1];
left = stack_pointer[-2];
- int res = PySequence_Contains(right, left);
+ DEOPT_IF(!PyTuple_CheckExact(right), CONTAINS_OP);
+ int res = _PyTuple_Contains((PyTupleObject *)right, left);
Py_DECREF(left);
Py_DECREF(right);
if (res < 0) goto pop_2_error;
&&TARGET_COMPARE_OP_FLOAT,
&&TARGET_COMPARE_OP_INT,
&&TARGET_COMPARE_OP_STR,
+ &&TARGET_CONTAINS_OP_DICT,
+ &&TARGET_CONTAINS_OP_LIST,
+ &&TARGET_CONTAINS_OP_SET,
+ &&TARGET_CONTAINS_OP_STR,
+ &&TARGET_CONTAINS_OP_TUPLE,
&&TARGET_FOR_ITER_GEN,
&&TARGET_FOR_ITER_LIST,
&&TARGET_FOR_ITER_RANGE,
&&_unknown_opcode,
&&_unknown_opcode,
&&_unknown_opcode,
- &&_unknown_opcode,
- &&_unknown_opcode,
- &&_unknown_opcode,
- &&_unknown_opcode,
- &&_unknown_opcode,
&&TARGET_INSTRUMENTED_RESUME,
&&TARGET_INSTRUMENTED_END_FOR,
&&TARGET_INSTRUMENTED_END_SEND,
break;
}
+ case _CONTAINS_OP_LIST: {
+ _Py_UopsSymbol *b;
+ b = sym_new_unknown(ctx);
+ if (b == NULL) goto out_of_space;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ break;
+ }
+
+ case _CONTAINS_OP_SET: {
+ _Py_UopsSymbol *b;
+ b = sym_new_unknown(ctx);
+ if (b == NULL) goto out_of_space;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ break;
+ }
+
+ case _CONTAINS_OP_TUPLE: {
+ _Py_UopsSymbol *b;
+ b = sym_new_unknown(ctx);
+ if (b == NULL) goto out_of_space;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ break;
+ }
+
+ case _CONTAINS_OP_DICT: {
+ _Py_UopsSymbol *b;
+ b = sym_new_unknown(ctx);
+ if (b == NULL) goto out_of_space;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ break;
+ }
+
+ case _CONTAINS_OP_STR: {
+ _Py_UopsSymbol *b;
+ b = sym_new_unknown(ctx);
+ if (b == NULL) goto out_of_space;
+ stack_pointer[-2] = b;
+ stack_pointer += -1;
+ break;
+ }
+
case _CHECK_EG_MATCH: {
_Py_UopsSymbol *rest;
_Py_UopsSymbol *match;
return NULL;
}
int err = 0;
+ err += add_stat_dict(stats, CONTAINS_OP, "contains_op");
err += add_stat_dict(stats, LOAD_SUPER_ATTR, "load_super_attr");
err += add_stat_dict(stats, LOAD_ATTR, "load_attr");
err += add_stat_dict(stats, LOAD_GLOBAL, "load_global");
cache->counter = adaptive_counter_cooldown();
}
+void
+_Py_Specialize_ContainsOp(PyObject *value, _Py_CODEUNIT *instr)
+{
+ assert(ENABLE_SPECIALIZATION);
+ assert(_PyOpcode_Caches[CONTAINS_OP] == INLINE_CACHE_ENTRIES_COMPARE_OP);
+ _PyContainsOpCache *cache = (_PyContainsOpCache *)(instr + 1);
+ if (PyUnicode_CheckExact(value)) {
+ instr->op.code = CONTAINS_OP_STR;
+ goto success;
+ }
+ if (PyList_CheckExact(value)) {
+ instr->op.code = CONTAINS_OP_LIST;
+ goto success;
+ }
+ if (PyTuple_CheckExact(value)) {
+ instr->op.code = CONTAINS_OP_TUPLE;
+ goto success;
+ }
+ if (PyDict_CheckExact(value)) {
+ instr->op.code = CONTAINS_OP_DICT;
+ goto success;
+ }
+ if (PySet_CheckExact(value)) {
+ instr->op.code = CONTAINS_OP_SET;
+ goto success;
+ }
+
+
+ STAT_INC(CONTAINS_OP, failure);
+ instr->op.code = CONTAINS_OP;
+ cache->counter = adaptive_counter_backoff(cache->counter);
+ return;
+success:
+ STAT_INC(CONTAINS_OP, success);
+ cache->counter = adaptive_counter_cooldown();
+}
+
/* Code init cleanup.
* CALL_ALLOC_AND_ENTER_INIT will set up
* the frame to execute the EXIT_INIT_CHECK
projects / thirdparty / Python / cpython.git / commitdiff
