Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-124442: make `__static_attributes__` deterministic by sorting (#124492) 

Signed-off-by: kp2pml30 <kp2pml30@gmail.com>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
This commit is contained in:
Kira 2024-09-29 01:15:43 +03:00 committed by GitHub
parent 69a4063ca5
commit 04c837d9d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/test/test_compile.py
View File

@ -1,6 +1,7 @@
import contextlib
import dis
import io
import itertools
import math
import opcode
import os
@ -2687,6 +2688,22 @@ class TestInstructionSequence(unittest.TestCase):
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
Misc/NEWS.d/next/Core_and_Builtins/2024-09-25-11-53-22.gh-issue-124442.EXC1Ve.rst Normal file
View File

@ -0,0 +1,2 @@
Fix nondeterminism in compilation by sorting the value of
:attr:`~type.__static_attributes__`. Patch by kp2pml30.

12
Python/compile.c
View File

@ -911,7 +911,17 @@ PyObject *
_PyCompile_StaticAttributesAsTuple(compiler *c)
{
assert(c->u->u_static_attributes);
return PySequence_Tuple(c->u->u_static_attributes);
PyObject *static_attributes_unsorted = PySequence_List(c->u->u_static_attributes);
if (static_attributes_unsorted == NULL) {
return NULL;
}
if (PyList_Sort(static_attributes_unsorted) != 0) {
Py_DECREF(static_attributes_unsorted);
return NULL;
}
PyObject *static_attributes = PySequence_Tuple(static_attributes_unsorted);
Py_DECREF(static_attributes_unsorted);
return static_attributes;
}
int