Skip to content

gh-148380: remove all uses of _PyType_LookupByVersion in optimizer_bytecodes.c #148394

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

Open
NekoAsakura wants to merge 9 commits into
base: main
Choose a base branch
from
Open

gh-148380: remove all uses of _PyType_LookupByVersion in optimizer_bytecodes.c #148394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4660757
gh-148380: remove all uses of `_PyType_LookupByVersion` in `optimizer…
NekoAsakura Apr 11, 2026
a65ab7c
Merge branch 'main' into gh-148380/remove-LookupByVersion
NekoAsakura Apr 11, 2026
565507e
gh-148380: revert `_GUARD_TYPE_VERSION`
NekoAsakura Apr 14, 2026
bc8a294
Merge branch 'main' into gh-148380/remove-LookupByVersion
NekoAsakura Apr 14, 2026
f05ff38
gh-148380: remove all uses of `_PyType_LookupByVersion` in `optimizer…
NekoAsakura Apr 14, 2026
b0dd8e4
gh-148380: remove redundant `_RECORD_TOS_TYPE`
NekoAsakura Apr 14, 2026
914ed80
Merge branch 'main' into gh-148380/remove-LookupByVersion
NekoAsakura Apr 14, 2026
c84a36a
gh-148380: relax assert
NekoAsakura Apr 14, 2026
4eb3e98
Merge branch 'main' into gh-148380/remove-LookupByVersion
NekoAsakura Apr 14, 2026
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
6 changes: 3 additions & 3 deletions Include/internal/pycore_opcode_metadata.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2906,14 +2906,15 @@ dummy_func(

macro(LOAD_ATTR_CLASS) =
unused/1 +
_RECORD_TOS +
_CHECK_ATTR_CLASS +
unused/2 +
_LOAD_ATTR_CLASS +
_PUSH_NULL_CONDITIONAL;

macro(LOAD_ATTR_CLASS_WITH_METACLASS_CHECK) =
unused/1 +
_RECORD_TOS_TYPE +
_RECORD_TOS +
_GUARD_TYPE_VERSION +
_CHECK_ATTR_CLASS +
_LOAD_ATTR_CLASS +
Expand Down
6 changes: 3 additions & 3 deletions Python/optimizer_bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ dummy_func(void) {
}

op(_CHECK_ATTR_CLASS, (type_version/2, owner -- owner)) {
PyObject *type = (PyObject *)_PyType_LookupByVersion(type_version);
if (type) {
PyObject *type = sym_get_probable_value(owner);
if (type != NULL && ((PyTypeObject *)type)->tp_version_tag == type_version) {
if (type == sym_get_const(ctx, owner)) {
ADD_OP(_NOP, 0, 0);
Copy link
Copy Markdown
Member

@Fidget-Spinner Fidget-Spinner Apr 11, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, It think this is bugged on main, there needs to be a watcher installed on the type for this path similar to _GUARD_TYPE_VERSION. would you like to open a PR to fix it?

Copy link
Copy Markdown
Contributor Author

@NekoAsakura NekoAsakura Apr 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure! Which issue should I link to?

Copy link
Copy Markdown
Member

@Fidget-Spinner Fidget-Spinner Apr 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. I think it's fine to open a new issue describing the bug.

}
Expand All @@ -246,7 +246,7 @@ dummy_func(void) {

op(_GUARD_TYPE_VERSION, (type_version/2, owner -- owner)) {
assert(type_version);
assert(this_instr[-1].opcode == _RECORD_TOS_TYPE);
assert(this_instr[-1].opcode == _RECORD_TOS_TYPE || this_instr[-1].opcode == _RECORD_TOS);
if (sym_matches_type_version(owner, type_version)) {
ADD_OP(_NOP, 0, 0);
}
Expand Down
6 changes: 3 additions & 3 deletions Python/optimizer_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions Python/record_functions.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading