Skip to content

[3.13] gh-124442: make __static_attributes__ deterministic by sorting (GH-124492) #124738

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
Oct 1, 2024
Merged

[3.13] gh-124442: make __static_attributes__ deterministic by sorting (GH-124492) #124738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd71f6e
[3.13] gh-124442: make `__static_attributes__` deterministic by sorti…
kp2pml30 Sep 28, 2024
c2ae6e3
Apply suggestions from code review
JelleZijlstra Sep 30, 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
17 changes: 17 additions & 0 deletions Lib/test/test_compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import contextlib
import dis
import io
import itertools
import math
import opcode
import os
Expand Down Expand Up @@ -2593,6 +2594,22 @@ def test_nested(self):
self.compare_instructions(seq, [('LOAD_CONST', 1, 1, 0, 0, 0)])
self.compare_instructions(seq.get_nested()[0], [('LOAD_CONST', 2, 2, 0, 0, 0)])

def test_static_attributes_are_sorted(self):
code = (
'class T:\n'
' def __init__(self):\n'
' self.{V1} = 10\n'
' self.{V2} = 10\n'
' def foo(self):\n'
' self.{V3} = 10\n'
)
attributes = ("a", "b", "c")
for perm in itertools.permutations(attributes):
var_names = {f'V{i + 1}': name for i, name in enumerate(perm)}
ns = run_code(code.format(**var_names))
t = ns['T']
self.assertEqual(t.__static_attributes__, attributes)


if __name__ == "__main__":
unittest.main()
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2024-09-25-11-53-22.gh-issue-124442.EXC1Ve.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix nondeterminism in compilation by sorting the value of
:attr:`~type.__static_attributes__`. Patch by kp2pml30.
13 changes: 12 additions & 1 deletion Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2544,7 +2544,18 @@ compiler_class_body(struct compiler *c, stmt_ty s, int firstlineno)
return ERROR;
}
assert(c->u->u_static_attributes);
PyObject *static_attributes = PySequence_Tuple(c->u->u_static_attributes);
PyObject *static_attributes_unsorted = PySequence_List(c->u->u_static_attributes);
if (static_attributes_unsorted == NULL) {
compiler_exit_scope(c);
return ERROR;
}
if (PyList_Sort(static_attributes_unsorted) != 0) {
compiler_exit_scope(c);
Py_DECREF(static_attributes_unsorted);
return ERROR;
}
PyObject *static_attributes = PySequence_Tuple(static_attributes_unsorted);
Py_DECREF(static_attributes_unsorted);
if (static_attributes == NULL) {
compiler_exit_scope(c);
return ERROR;
Expand Down
Loading