Skip to content

gh-126513: Use helpers for _Py_Specialize_ConstainsOp #126517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 6, 2024
Merged

gh-126513: Use helpers for _Py_Specialize_ConstainsOp #126517

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c72433
Use helpers for _Py_Specialize_ConstainsOp
Eclips4 Nov 6, 2024
ec0fa16
Remove unnecessary variable
Eclips4 Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions Python/specialize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2760,8 +2760,8 @@ _Py_Specialize_ToBool(_PyStackRef value_o, _Py_CODEUNIT *instr)
cache->counter = adaptive_counter_cooldown();
}

#ifdef Py_STATS
static int containsop_fail_kind(PyObject *value) {
static int
containsop_fail_kind(PyObject *value) {
if (PyUnicode_CheckExact(value)) {
return SPEC_FAIL_CONTAINS_OP_STR;
}
Expand All @@ -2776,7 +2776,6 @@ static int containsop_fail_kind(PyObject *value) {
}
return SPEC_FAIL_OTHER;
}
#endif // Py_STATS

void
_Py_Specialize_ContainsOp(_PyStackRef value_st, _Py_CODEUNIT *instr)
Expand All @@ -2785,26 +2784,17 @@ _Py_Specialize_ContainsOp(_PyStackRef value_st, _Py_CODEUNIT *instr)

assert(ENABLE_SPECIALIZATION_FT);
assert(_PyOpcode_Caches[CONTAINS_OP] == INLINE_CACHE_ENTRIES_COMPARE_OP);
uint8_t specialized_op;
_PyContainsOpCache *cache = (_PyContainsOpCache *)(instr + 1);
if (PyDict_CheckExact(value)) {
specialized_op = CONTAINS_OP_DICT;
goto success;
specialize(instr, CONTAINS_OP_DICT);
return;
}
if (PySet_CheckExact(value) || PyFrozenSet_CheckExact(value)) {
specialized_op = CONTAINS_OP_SET;
goto success;
specialize(instr, CONTAINS_OP_SET);
return;
}

SPECIALIZATION_FAIL(CONTAINS_OP, containsop_fail_kind(value));
STAT_INC(CONTAINS_OP, failure);
SET_OPCODE_OR_RETURN(instr, CONTAINS_OP);
cache->counter = adaptive_counter_backoff(cache->counter);
unspecialize(instr, containsop_fail_kind(value));
return;
success:
STAT_INC(CONTAINS_OP, success);
SET_OPCODE_OR_RETURN(instr, specialized_op);
cache->counter = adaptive_counter_cooldown();
}

/* Code init cleanup.
Expand Down
Loading