gh-116381: Specialize CONTAINS_OP (GH-116385)

* Specialize CONTAINS_OP

* 📜🤖 Added by blurb_it.

* Add PyAPI_FUNC for JIT

---------

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>

7 files changed, 167 insertions, 103 deletions

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index a4e6482..8eabd49 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -121,6 +121,12 @@ typedef struct {
 
 #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;
@@ -277,6 +283,7 @@ extern void _Py_Specialize_UnpackSequence(PyObject *seq, _Py_CODEUNIT *instr,
 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);
diff --git a/Include/internal/pycore_list.h b/Include/internal/pycore_list.h
index 2a82912..92cab73 100644
--- a/Include/internal/pycore_list.h
+++ b/Include/internal/pycore_list.h
@@ -56,6 +56,8 @@ typedef struct {
 
 PyAPI_FUNC(PyObject *)_PyList_FromArraySteal(PyObject *const *src, Py_ssize_t n);
 
+PyAPI_FUNC(int) _PyList_Contains(PyObject *aa, PyObject *el);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
index f355a49..4c691d6 100644
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -151,6 +151,16 @@ int _PyOpcode_num_popped(int opcode, int oparg)  {
             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:
@@ -576,6 +586,16 @@ int _PyOpcode_num_pushed(int opcode, int oparg)  {
             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:
@@ -1002,7 +1022,12 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[268] = {
     [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 },
@@ -1225,6 +1250,11 @@ _PyOpcode_macro_expansion[256] = {
     [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 } } },
@@ -1398,6 +1428,11 @@ const char *_PyOpcode_OpName[268] = {
     [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",
@@ -1578,6 +1613,7 @@ const uint8_t _PyOpcode_Caches[256] = {
     [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,
@@ -1648,6 +1684,11 @@ const uint8_t _PyOpcode_Deopt[256] = {
     [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,
@@ -1834,11 +1875,6 @@ const uint8_t _PyOpcode_Deopt[256] = {
     case 146: \
     case 147: \
     case 148: \
-    case 219: \
-    case 220: \
-    case 221: \
-    case 222: \
-    case 223: \
     case 224: \
     case 225: \
     case 226: \
diff --git a/Include/internal/pycore_setobject.h b/Include/internal/pycore_setobject.h
index 34a00e6..c4ec3ce 100644
--- a/Include/internal/pycore_setobject.h
+++ b/Include/internal/pycore_setobject.h
@@ -21,6 +21,8 @@ PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable);
 // 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
diff --git a/Include/internal/pycore_tuple.h b/Include/internal/pycore_tuple.h
index 14a9e42..edde404 100644
--- a/Include/internal/pycore_tuple.h
+++ b/Include/internal/pycore_tuple.h
@@ -29,6 +29,8 @@ typedef struct {
     PyTupleObject *it_seq; /* Set to NULL when iterator is exhausted */
 } _PyTupleIterObject;
 
+PyAPI_FUNC(int) _PyTuple_Contains(PyTupleObject *a, PyObject *el);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h
index 856f340..5bf10ae 100644
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -74,7 +74,12 @@ extern "C" {
 #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
@@ -88,41 +93,41 @@ extern "C" {
 #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
@@ -139,65 +144,65 @@ extern "C" {
 #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
@@ -211,48 +216,48 @@ extern "C" {
 #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
@@ -262,12 +267,12 @@ extern "C" {
 #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
 }
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
index c388fbf..23aead2 100644
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -154,6 +154,11 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
     [_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,
@@ -308,6 +313,11 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
     [_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",