From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 9 Dec 2025 18:50:53 +0000 (+0100) Subject: [3.14] gh-142454: Make the JIT digest more deterministic by sorting the files in... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7621bbd828bb42e3b54aae45bd33563cfa9e5ccb;p=thirdparty%2FPython%2Fcpython.git [3.14] gh-142454: Make the JIT digest more deterministic by sorting the files in Tools/jit (GH-142455) (#142485) gh-142454: Make the JIT digest more deterministic by sorting the files in Tools/jit (GH-142455) (cherry picked from commit bcf90de8ba2ea087540a5f632656ef880ee46b5c) Co-authored-by: Miro Hrončok Co-authored-by: Ken Jin --- diff --git a/Misc/NEWS.d/next/Build/2025-12-09-13-33-46.gh-issue-142454.cqUxzQ.rst b/Misc/NEWS.d/next/Build/2025-12-09-13-33-46.gh-issue-142454.cqUxzQ.rst new file mode 100644 index 000000000000..4de16866f288 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-12-09-13-33-46.gh-issue-142454.cqUxzQ.rst @@ -0,0 +1,4 @@ +When calculating the digest of the JIT stencils input, sort the hashed files +by filenames before adding their content to the hasher. This ensures +deterministic hash input and hence deterministic hash, independent on +filesystem order. diff --git a/Tools/jit/_targets.py b/Tools/jit/_targets.py index d7c9aed1191c..f1085cc9bf08 100644 --- a/Tools/jit/_targets.py +++ b/Tools/jit/_targets.py @@ -72,7 +72,7 @@ class _Target(typing.Generic[_S, _R]): # Exclude cache files from digest computation to ensure reproducible builds. if dirpath.endswith("__pycache__"): continue - for filename in filenames: + for filename in sorted(filenames): hasher.update(pathlib.Path(dirpath, filename).read_bytes()) return hasher.hexdigest()