https://github.com/python/cpython/commit/e535bdb0a2a9d1a0f588f23923ef3067fecdaeb6
commit: e535bdb0a2a9d1a0f588f23923ef3067fecdaeb6
branch: main
author: Nadeshiko Manju <[email protected]>
committer: Fidget-Spinner <[email protected]>
date: 2026-01-12T15:47:31Z
summary:
gh-134584: Eliminate redundant refcounting from `_CONTAINS_{OP|OP_SET|OP_DICT}`
(GH-143731)
Signed-off-by: Manjusaka <[email protected]>
files:
A
Misc/NEWS.d/next/Core_and_Builtins/2026-01-12-22-49-36.gh-issue-134584.guDlsj.rst
M Include/internal/pycore_opcode_metadata.h
M Include/internal/pycore_uop_ids.h
M Include/internal/pycore_uop_metadata.h
M Lib/test/test_capi/test_opt.py
M Python/bytecodes.c
M Python/executor_cases.c.h
M Python/generated_cases.c.h
M Python/optimizer_bytecodes.c
M Python/optimizer_cases.c.h
diff --git a/Include/internal/pycore_opcode_metadata.h
b/Include/internal/pycore_opcode_metadata.h
index 0fd305dd72c322..98a6b991128738 100644
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -1154,9 +1154,9 @@ const struct opcode_metadata
_PyOpcode_opcode_metadata[267] = {
[COMPARE_OP_FLOAT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG },
[COMPARE_OP_INT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG },
[COMPARE_OP_STR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_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_EXIT_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] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG },
+ [CONTAINS_OP_DICT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG |
HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG },
+ [CONTAINS_OP_SET] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG |
HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG },
[CONVERT_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG },
[COPY] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_PURE_FLAG },
[COPY_FREE_VARS] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
@@ -1402,9 +1402,9 @@ _PyOpcode_macro_expansion[256] = {
[COMPARE_OP_FLOAT] = { .nuops = 5, .uops = { { _GUARD_TOS_FLOAT,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _COMPARE_OP_FLOAT,
OPARG_SIMPLE, 1 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 1 }, { _POP_TOP_FLOAT,
OPARG_SIMPLE, 1 } } },
[COMPARE_OP_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE,
0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _COMPARE_OP_INT, OPARG_SIMPLE, 1 },
{ _POP_TOP_INT, OPARG_SIMPLE, 1 }, { _POP_TOP_INT, OPARG_SIMPLE, 1 } } },
[COMPARE_OP_STR] = { .nuops = 5, .uops = { { _GUARD_TOS_UNICODE,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _COMPARE_OP_STR,
OPARG_SIMPLE, 1 }, { _POP_TOP_UNICODE, OPARG_SIMPLE, 1 }, { _POP_TOP_UNICODE,
OPARG_SIMPLE, 1 } } },
- [CONTAINS_OP] = { .nuops = 1, .uops = { { _CONTAINS_OP, OPARG_SIMPLE, 0 }
} },
- [CONTAINS_OP_DICT] = { .nuops = 2, .uops = { { _GUARD_TOS_DICT,
OPARG_SIMPLE, 0 }, { _CONTAINS_OP_DICT, OPARG_SIMPLE, 1 } } },
- [CONTAINS_OP_SET] = { .nuops = 2, .uops = { { _GUARD_TOS_ANY_SET,
OPARG_SIMPLE, 0 }, { _CONTAINS_OP_SET, OPARG_SIMPLE, 1 } } },
+ [CONTAINS_OP] = { .nuops = 3, .uops = { { _CONTAINS_OP, OPARG_SIMPLE, 0 },
{ _POP_TOP, OPARG_SIMPLE, 0 }, { _POP_TOP, OPARG_SIMPLE, 0 } } },
+ [CONTAINS_OP_DICT] = { .nuops = 4, .uops = { { _GUARD_TOS_DICT,
OPARG_SIMPLE, 0 }, { _CONTAINS_OP_DICT, OPARG_SIMPLE, 1 }, { _POP_TOP,
OPARG_SIMPLE, 1 }, { _POP_TOP, OPARG_SIMPLE, 1 } } },
+ [CONTAINS_OP_SET] = { .nuops = 4, .uops = { { _GUARD_TOS_ANY_SET,
OPARG_SIMPLE, 0 }, { _CONTAINS_OP_SET, OPARG_SIMPLE, 1 }, { _POP_TOP,
OPARG_SIMPLE, 1 }, { _POP_TOP, OPARG_SIMPLE, 1 } } },
[CONVERT_VALUE] = { .nuops = 1, .uops = { { _CONVERT_VALUE, OPARG_SIMPLE,
0 } } },
[COPY] = { .nuops = 1, .uops = { { _COPY, OPARG_SIMPLE, 0 } } },
[COPY_FREE_VARS] = { .nuops = 1, .uops = { { _COPY_FREE_VARS,
OPARG_SIMPLE, 0 } } },
diff --git a/Include/internal/pycore_uop_ids.h
b/Include/internal/pycore_uop_ids.h
index c11e72ab8c5cf7..6af2acd5128d64 100644
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -503,9 +503,9 @@ extern "C" {
#define _COMPARE_OP_FLOAT_r23 699
#define _COMPARE_OP_INT_r23 700
#define _COMPARE_OP_STR_r23 701
-#define _CONTAINS_OP_r21 702
-#define _CONTAINS_OP_DICT_r21 703
-#define _CONTAINS_OP_SET_r21 704
+#define _CONTAINS_OP_r23 702
+#define _CONTAINS_OP_DICT_r23 703
+#define _CONTAINS_OP_SET_r23 704
#define _CONVERT_VALUE_r11 705
#define _COPY_r01 706
#define _COPY_1_r02 707
diff --git a/Include/internal/pycore_uop_metadata.h
b/Include/internal/pycore_uop_metadata.h
index 4cc1184001089d..a14c1ccf4843ef 100644
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -208,10 +208,10 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_COMPARE_OP_INT] = HAS_ARG_FLAG,
[_COMPARE_OP_STR] = HAS_ARG_FLAG,
[_IS_OP] = HAS_ARG_FLAG,
- [_CONTAINS_OP] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
+ [_CONTAINS_OP] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG |
HAS_ESCAPES_FLAG,
[_GUARD_TOS_ANY_SET] = HAS_DEOPT_FLAG,
- [_CONTAINS_OP_SET] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
- [_CONTAINS_OP_DICT] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
+ [_CONTAINS_OP_SET] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG
| HAS_ESCAPES_FLAG,
+ [_CONTAINS_OP_DICT] = HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG,
[_CHECK_EG_MATCH] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CHECK_EXC_MATCH] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG |
HAS_ESCAPES_FLAG,
[_IMPORT_NAME] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG,
@@ -1938,7 +1938,7 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
.entries = {
{ -1, -1, -1 },
{ -1, -1, -1 },
- { 1, 2, _CONTAINS_OP_r21 },
+ { 3, 2, _CONTAINS_OP_r23 },
{ -1, -1, -1 },
},
},
@@ -1956,7 +1956,7 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
.entries = {
{ -1, -1, -1 },
{ -1, -1, -1 },
- { 1, 2, _CONTAINS_OP_SET_r21 },
+ { 3, 2, _CONTAINS_OP_SET_r23 },
{ -1, -1, -1 },
},
},
@@ -1965,7 +1965,7 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
.entries = {
{ -1, -1, -1 },
{ -1, -1, -1 },
- { 1, 2, _CONTAINS_OP_DICT_r21 },
+ { 3, 2, _CONTAINS_OP_DICT_r23 },
{ -1, -1, -1 },
},
},
@@ -3710,13 +3710,13 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = {
[_IS_OP_r03] = _IS_OP,
[_IS_OP_r13] = _IS_OP,
[_IS_OP_r23] = _IS_OP,
- [_CONTAINS_OP_r21] = _CONTAINS_OP,
+ [_CONTAINS_OP_r23] = _CONTAINS_OP,
[_GUARD_TOS_ANY_SET_r01] = _GUARD_TOS_ANY_SET,
[_GUARD_TOS_ANY_SET_r11] = _GUARD_TOS_ANY_SET,
[_GUARD_TOS_ANY_SET_r22] = _GUARD_TOS_ANY_SET,
[_GUARD_TOS_ANY_SET_r33] = _GUARD_TOS_ANY_SET,
- [_CONTAINS_OP_SET_r21] = _CONTAINS_OP_SET,
- [_CONTAINS_OP_DICT_r21] = _CONTAINS_OP_DICT,
+ [_CONTAINS_OP_SET_r23] = _CONTAINS_OP_SET,
+ [_CONTAINS_OP_DICT_r23] = _CONTAINS_OP_DICT,
[_CHECK_EG_MATCH_r22] = _CHECK_EG_MATCH,
[_CHECK_EXC_MATCH_r22] = _CHECK_EXC_MATCH,
[_IMPORT_NAME_r21] = _IMPORT_NAME,
@@ -4288,11 +4288,11 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1]
= {
[_COMPARE_OP_STR] = "_COMPARE_OP_STR",
[_COMPARE_OP_STR_r23] = "_COMPARE_OP_STR_r23",
[_CONTAINS_OP] = "_CONTAINS_OP",
- [_CONTAINS_OP_r21] = "_CONTAINS_OP_r21",
+ [_CONTAINS_OP_r23] = "_CONTAINS_OP_r23",
[_CONTAINS_OP_DICT] = "_CONTAINS_OP_DICT",
- [_CONTAINS_OP_DICT_r21] = "_CONTAINS_OP_DICT_r21",
+ [_CONTAINS_OP_DICT_r23] = "_CONTAINS_OP_DICT_r23",
[_CONTAINS_OP_SET] = "_CONTAINS_OP_SET",
- [_CONTAINS_OP_SET_r21] = "_CONTAINS_OP_SET_r21",
+ [_CONTAINS_OP_SET_r23] = "_CONTAINS_OP_SET_r23",
[_CONVERT_VALUE] = "_CONVERT_VALUE",
[_CONVERT_VALUE_r11] = "_CONVERT_VALUE_r11",
[_COPY] = "_COPY",
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
index 79c5c22c13f557..62c16fd6cb1db8 100644
--- a/Lib/test/test_capi/test_opt.py
+++ b/Lib/test/test_capi/test_opt.py
@@ -1992,6 +1992,57 @@ def testfunc(n):
self.assertIn("_BINARY_OP_SUBSCR_DICT", uops)
self.assertLessEqual(count_ops(ex, "_POP_TOP"), 2)
+ def test_contains_op(self):
+ def testfunc(n):
+ x = 0
+ items = [1, 2, 3]
+ for _ in range(n):
+ if 2 in items:
+ x += 1
+ return x
+
+ res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+ self.assertEqual(res, TIER2_THRESHOLD)
+ self.assertIsNotNone(ex)
+ uops = get_opnames(ex)
+ self.assertIn("_CONTAINS_OP", uops)
+ self.assertIn("_POP_TOP_NOP", uops)
+ self.assertLessEqual(count_ops(ex, "_POP_TOP"), 2)
+
+ def test_contains_op_set(self):
+ def testfunc(n):
+ x = 0
+ s = {1, 2, 3}
+ for _ in range(n):
+ if 2 in s:
+ x += 1
+ return x
+
+ res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+ self.assertEqual(res, TIER2_THRESHOLD)
+ self.assertIsNotNone(ex)
+ uops = get_opnames(ex)
+ self.assertIn("_CONTAINS_OP_SET", uops)
+ self.assertIn("_POP_TOP_NOP", uops)
+ self.assertLessEqual(count_ops(ex, "_POP_TOP"), 2)
+
+ def test_contains_op_dict(self):
+ def testfunc(n):
+ x = 0
+ d = {'a': 1, 'b': 2}
+ for _ in range(n):
+ if 'a' in d:
+ x += 1
+ return x
+
+ res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+ self.assertEqual(res, TIER2_THRESHOLD)
+ self.assertIsNotNone(ex)
+ uops = get_opnames(ex)
+ self.assertIn("_CONTAINS_OP_DICT", uops)
+ self.assertIn("_POP_TOP_NOP", uops)
+ self.assertLessEqual(count_ops(ex, "_POP_TOP"), 2)
+
def test_call_type_1_guards_removed(self):
def testfunc(n):
x = 0
diff --git
a/Misc/NEWS.d/next/Core_and_Builtins/2026-01-12-22-49-36.gh-issue-134584.guDlsj.rst
b/Misc/NEWS.d/next/Core_and_Builtins/2026-01-12-22-49-36.gh-issue-134584.guDlsj.rst
new file mode 100644
index 00000000000000..712ddd3793194b
--- /dev/null
+++
b/Misc/NEWS.d/next/Core_and_Builtins/2026-01-12-22-49-36.gh-issue-134584.guDlsj.rst
@@ -0,0 +1,2 @@
+Eliminate redundant refcounting from ``_CONTAINS_OP``, ``_CONTAINS_OP_SET``
+and ``_CONTAINS_OP_DICT``.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 18d66ae812fee9..880472713a8344 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2855,14 +2855,18 @@ dummy_func(
CONTAINS_OP_DICT,
};
- op(_CONTAINS_OP, (left, right -- b)) {
+ op(_CONTAINS_OP, (left, right -- b, l, r)) {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
int res = PySequence_Contains(right_o, left_o);
- DECREF_INPUTS();
- ERROR_IF(res < 0);
+ if (res < 0) {
+ ERROR_NO_POP();
+ }
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
+ l = left;
+ r = right;
+ INPUTS_DEAD();
}
specializing op(_SPECIALIZE_CONTAINS_OP, (counter/1, left, right --
left, right)) {
@@ -2877,16 +2881,16 @@ dummy_func(
#endif /* ENABLE_SPECIALIZATION_FT */
}
- macro(CONTAINS_OP) = _SPECIALIZE_CONTAINS_OP + _CONTAINS_OP;
+ macro(CONTAINS_OP) = _SPECIALIZE_CONTAINS_OP + _CONTAINS_OP + POP_TOP
+ POP_TOP;
op(_GUARD_TOS_ANY_SET, (tos -- tos)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
DEOPT_IF(!PyAnySet_CheckExact(o));
}
- macro(CONTAINS_OP_SET) = _GUARD_TOS_ANY_SET + unused/1 +
_CONTAINS_OP_SET;
+ macro(CONTAINS_OP_SET) = _GUARD_TOS_ANY_SET + unused/1 +
_CONTAINS_OP_SET + POP_TOP + POP_TOP;
- op(_CONTAINS_OP_SET, (left, right -- b)) {
+ op(_CONTAINS_OP_SET, (left, right -- b, l, r)) {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
@@ -2894,23 +2898,31 @@ dummy_func(
STAT_INC(CONTAINS_OP, hit);
// Note: both set and frozenset use the same seq_contains method!
int res = _PySet_Contains((PySetObject *)right_o, left_o);
- DECREF_INPUTS();
- ERROR_IF(res < 0);
+ if (res < 0) {
+ ERROR_NO_POP();
+ }
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
+ l = left;
+ r = right;
+ INPUTS_DEAD();
}
- macro(CONTAINS_OP_DICT) = _GUARD_TOS_DICT + unused/1 +
_CONTAINS_OP_DICT;
+ macro(CONTAINS_OP_DICT) = _GUARD_TOS_DICT + unused/1 +
_CONTAINS_OP_DICT + POP_TOP + POP_TOP;
- op(_CONTAINS_OP_DICT, (left, right -- b)) {
+ op(_CONTAINS_OP_DICT, (left, right -- b, l, r)) {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
assert(PyDict_CheckExact(right_o));
STAT_INC(CONTAINS_OP, hit);
int res = PyDict_Contains(right_o, left_o);
- DECREF_INPUTS();
- ERROR_IF(res < 0);
+ if (res < 0) {
+ ERROR_NO_POP();
+ }
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
+ l = left;
+ r = right;
+ INPUTS_DEAD();
}
inst(CHECK_EG_MATCH, (exc_value_st, match_type_st -- rest, match)) {
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 1e1badd9a1f777..c2b9d9c31997b0 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -10150,12 +10150,14 @@
break;
}
- case _CONTAINS_OP_r21: {
+ case _CONTAINS_OP_r23: {
CHECK_CURRENT_CACHED_VALUES(2);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef right;
_PyStackRef left;
_PyStackRef b;
+ _PyStackRef l;
+ _PyStackRef r;
_PyStackRef _stack_item_0 = _tos_cache0;
_PyStackRef _stack_item_1 = _tos_cache1;
oparg = CURRENT_OPARG();
@@ -10169,26 +10171,20 @@
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
int res = PySequence_Contains(right_o, left_o);
- _PyStackRef tmp = right;
- right = PyStackRef_NULL;
- stack_pointer[-1] = right;
- PyStackRef_CLOSE(tmp);
- tmp = left;
- left = PyStackRef_NULL;
- stack_pointer[-2] = left;
- PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
if (res < 0) {
SET_CURRENT_CACHED_VALUES(0);
JUMP_TO_ERROR();
}
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
+ l = left;
+ r = right;
+ _tos_cache2 = r;
+ _tos_cache1 = l;
_tos_cache0 = b;
- _tos_cache1 = PyStackRef_ZERO_BITS;
- _tos_cache2 = PyStackRef_ZERO_BITS;
- SET_CURRENT_CACHED_VALUES(1);
+ SET_CURRENT_CACHED_VALUES(3);
+ stack_pointer += -2;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}
@@ -10278,12 +10274,14 @@
break;
}
- case _CONTAINS_OP_SET_r21: {
+ case _CONTAINS_OP_SET_r23: {
CHECK_CURRENT_CACHED_VALUES(2);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef right;
_PyStackRef left;
_PyStackRef b;
+ _PyStackRef l;
+ _PyStackRef r;
_PyStackRef _stack_item_0 = _tos_cache0;
_PyStackRef _stack_item_1 = _tos_cache1;
oparg = CURRENT_OPARG();
@@ -10299,36 +10297,32 @@
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
int res = _PySet_Contains((PySetObject *)right_o, left_o);
- _PyStackRef tmp = right;
- right = PyStackRef_NULL;
- stack_pointer[-1] = right;
- PyStackRef_CLOSE(tmp);
- tmp = left;
- left = PyStackRef_NULL;
- stack_pointer[-2] = left;
- PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
if (res < 0) {
SET_CURRENT_CACHED_VALUES(0);
JUMP_TO_ERROR();
}
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
+ l = left;
+ r = right;
+ _tos_cache2 = r;
+ _tos_cache1 = l;
_tos_cache0 = b;
- _tos_cache1 = PyStackRef_ZERO_BITS;
- _tos_cache2 = PyStackRef_ZERO_BITS;
- SET_CURRENT_CACHED_VALUES(1);
+ SET_CURRENT_CACHED_VALUES(3);
+ stack_pointer += -2;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}
- case _CONTAINS_OP_DICT_r21: {
+ case _CONTAINS_OP_DICT_r23: {
CHECK_CURRENT_CACHED_VALUES(2);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef right;
_PyStackRef left;
_PyStackRef b;
+ _PyStackRef l;
+ _PyStackRef r;
_PyStackRef _stack_item_0 = _tos_cache0;
_PyStackRef _stack_item_1 = _tos_cache1;
oparg = CURRENT_OPARG();
@@ -10344,26 +10338,20 @@
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
int res = PyDict_Contains(right_o, left_o);
- _PyStackRef tmp = right;
- right = PyStackRef_NULL;
- stack_pointer[-1] = right;
- PyStackRef_CLOSE(tmp);
- tmp = left;
- left = PyStackRef_NULL;
- stack_pointer[-2] = left;
- PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
if (res < 0) {
SET_CURRENT_CACHED_VALUES(0);
JUMP_TO_ERROR();
}
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
+ l = left;
+ r = right;
+ _tos_cache2 = r;
+ _tos_cache1 = l;
_tos_cache0 = b;
- _tos_cache1 = PyStackRef_ZERO_BITS;
- _tos_cache2 = PyStackRef_ZERO_BITS;
- SET_CURRENT_CACHED_VALUES(1);
+ SET_CURRENT_CACHED_VALUES(3);
+ stack_pointer += -2;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 2efdf5b0b990df..23f02c8c74d71f 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -5029,6 +5029,9 @@
_PyStackRef right;
_PyStackRef left;
_PyStackRef b;
+ _PyStackRef l;
+ _PyStackRef r;
+ _PyStackRef value;
// _SPECIALIZE_CONTAINS_OP
{
right = stack_pointer[-1];
@@ -5053,25 +5056,32 @@
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
_PyFrame_SetStackPointer(frame, stack_pointer);
int res = PySequence_Contains(right_o, left_o);
- _PyStackRef tmp = right;
- right = PyStackRef_NULL;
- stack_pointer[-1] = right;
- PyStackRef_CLOSE(tmp);
- tmp = left;
- left = PyStackRef_NULL;
- stack_pointer[-2] = left;
- PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
if (res < 0) {
JUMP_TO_LABEL(error);
}
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
+ l = left;
+ r = right;
+ }
+ // _POP_TOP
+ {
+ value = r;
+ stack_pointer[-2] = b;
+ stack_pointer[-1] = l;
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_XCLOSE(value);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ }
+ // _POP_TOP
+ {
+ value = l;
+ stack_pointer += -1;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_XCLOSE(value);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
}
- stack_pointer[0] = b;
- stack_pointer += 1;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
DISPATCH();
}
@@ -5090,6 +5100,9 @@
_PyStackRef left;
_PyStackRef right;
_PyStackRef b;
+ _PyStackRef l;
+ _PyStackRef r;
+ _PyStackRef value;
// _GUARD_TOS_DICT
{
tos = stack_pointer[-1];
@@ -5111,25 +5124,32 @@
STAT_INC(CONTAINS_OP, hit);
_PyFrame_SetStackPointer(frame, stack_pointer);
int res = PyDict_Contains(right_o, left_o);
- _PyStackRef tmp = right;
- right = PyStackRef_NULL;
- stack_pointer[-1] = right;
- PyStackRef_CLOSE(tmp);
- tmp = left;
- left = PyStackRef_NULL;
- stack_pointer[-2] = left;
- PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
if (res < 0) {
JUMP_TO_LABEL(error);
}
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
+ l = left;
+ r = right;
+ }
+ // _POP_TOP
+ {
+ value = r;
+ stack_pointer[-2] = b;
+ stack_pointer[-1] = l;
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_XCLOSE(value);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ }
+ // _POP_TOP
+ {
+ value = l;
+ stack_pointer += -1;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_XCLOSE(value);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
}
- stack_pointer[0] = b;
- stack_pointer += 1;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
DISPATCH();
}
@@ -5148,6 +5168,9 @@
_PyStackRef left;
_PyStackRef right;
_PyStackRef b;
+ _PyStackRef l;
+ _PyStackRef r;
+ _PyStackRef value;
// _GUARD_TOS_ANY_SET
{
tos = stack_pointer[-1];
@@ -5169,25 +5192,32 @@
STAT_INC(CONTAINS_OP, hit);
_PyFrame_SetStackPointer(frame, stack_pointer);
int res = _PySet_Contains((PySetObject *)right_o, left_o);
- _PyStackRef tmp = right;
- right = PyStackRef_NULL;
- stack_pointer[-1] = right;
- PyStackRef_CLOSE(tmp);
- tmp = left;
- left = PyStackRef_NULL;
- stack_pointer[-2] = left;
- PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
if (res < 0) {
JUMP_TO_LABEL(error);
}
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
+ l = left;
+ r = right;
+ }
+ // _POP_TOP
+ {
+ value = r;
+ stack_pointer[-2] = b;
+ stack_pointer[-1] = l;
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_XCLOSE(value);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ }
+ // _POP_TOP
+ {
+ value = l;
+ stack_pointer += -1;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_XCLOSE(value);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
}
- stack_pointer[0] = b;
- stack_pointer += 1;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
DISPATCH();
}
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index e85536bfc3a493..49fb9e7625aaf2 100644
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -525,17 +525,23 @@ dummy_func(void) {
r = right;
}
- op(_CONTAINS_OP, (left, right -- b)) {
- REPLACE_OPCODE_IF_EVALUATES_PURE(left, right, b);
+ op(_CONTAINS_OP, (left, right -- b, l, r)) {
b = sym_new_type(ctx, &PyBool_Type);
+ l = left;
+ r = right;
+ REPLACE_OPCODE_IF_EVALUATES_PURE(left, right, b);
}
- op(_CONTAINS_OP_SET, (left, right -- b)) {
+ op(_CONTAINS_OP_SET, (left, right -- b, l, r)) {
b = sym_new_type(ctx, &PyBool_Type);
+ l = left;
+ r = right;
}
- op(_CONTAINS_OP_DICT, (left, right -- b)) {
+ op(_CONTAINS_OP_DICT, (left, right -- b, l, r)) {
b = sym_new_type(ctx, &PyBool_Type);
+ l = left;
+ r = right;
}
op(_LOAD_CONST, (-- value)) {
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index 898930a01b16af..d522c5a0c19459 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -2271,8 +2271,13 @@
JitOptRef right;
JitOptRef left;
JitOptRef b;
+ JitOptRef l;
+ JitOptRef r;
right = stack_pointer[-1];
left = stack_pointer[-2];
+ b = sym_new_type(ctx, &PyBool_Type);
+ l = left;
+ r = right;
if (
sym_is_safe_const(ctx, left) &&
sym_is_safe_const(ctx, right)
@@ -2282,33 +2287,42 @@
_PyStackRef left = sym_get_const_as_stackref(ctx, left_sym);
_PyStackRef right = sym_get_const_as_stackref(ctx, right_sym);
_PyStackRef b_stackref;
+ _PyStackRef l_stackref;
+ _PyStackRef r_stackref;
/* Start of uop copied from bytecodes for constant evaluation
*/
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
int res = PySequence_Contains(right_o, left_o);
if (res < 0) {
- goto error;
+ JUMP_TO_LABEL(error);
}
b_stackref = (res ^ oparg) ? PyStackRef_True :
PyStackRef_False;
+ l_stackref = left;
+ r_stackref = right;
/* End of uop copied from bytecodes for constant evaluation */
+ (void)l_stackref;
+ (void)r_stackref;
b = sym_new_const_steal(ctx,
PyStackRef_AsPyObjectSteal(b_stackref));
if (sym_is_const(ctx, b)) {
PyObject *result = sym_get_const(ctx, b);
if (_Py_IsImmortal(result)) {
- // Replace with _POP_TWO_LOAD_CONST_INLINE_BORROW
since we have two inputs and an immortal result
- REPLACE_OP(this_instr,
_POP_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)result);
+ // Replace with _INSERT_2_LOAD_CONST_INLINE_BORROW
since we have two inputs and an immortal result
+ REPLACE_OP(this_instr,
_INSERT_2_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)result);
}
}
- CHECK_STACK_BOUNDS(-1);
+ CHECK_STACK_BOUNDS(1);
stack_pointer[-2] = b;
- stack_pointer += -1;
+ stack_pointer[-1] = l;
+ stack_pointer[0] = r;
+ stack_pointer += 1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}
- b = sym_new_type(ctx, &PyBool_Type);
- CHECK_STACK_BOUNDS(-1);
+ CHECK_STACK_BOUNDS(1);
stack_pointer[-2] = b;
- stack_pointer += -1;
+ stack_pointer[-1] = l;
+ stack_pointer[0] = r;
+ stack_pointer += 1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}
@@ -2325,21 +2339,41 @@
}
case _CONTAINS_OP_SET: {
+ JitOptRef right;
+ JitOptRef left;
JitOptRef b;
+ JitOptRef l;
+ JitOptRef r;
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
b = sym_new_type(ctx, &PyBool_Type);
- CHECK_STACK_BOUNDS(-1);
+ l = left;
+ r = right;
+ CHECK_STACK_BOUNDS(1);
stack_pointer[-2] = b;
- stack_pointer += -1;
+ stack_pointer[-1] = l;
+ stack_pointer[0] = r;
+ stack_pointer += 1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}
case _CONTAINS_OP_DICT: {
+ JitOptRef right;
+ JitOptRef left;
JitOptRef b;
+ JitOptRef l;
+ JitOptRef r;
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
b = sym_new_type(ctx, &PyBool_Type);
- CHECK_STACK_BOUNDS(-1);
+ l = left;
+ r = right;
+ CHECK_STACK_BOUNDS(1);
stack_pointer[-2] = b;
- stack_pointer += -1;
+ stack_pointer[-1] = l;
+ stack_pointer[0] = r;
+ stack_pointer += 1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
