From 780366123feef0de0e8dcea4b4008511f29ba50b Mon Sep 17 00:00:00 2001 From: sobolevn Date: Tue, 22 Apr 2025 11:59:54 +0300 Subject: [PATCH 1/3] Update zizmor to `v1.6.0` --- .github/zizmor.yml | 4 ++++ .pre-commit-config.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/zizmor.yml b/.github/zizmor.yml index eeda8d9eaaf484..9b42b47cc85545 100644 --- a/.github/zizmor.yml +++ b/.github/zizmor.yml @@ -4,3 +4,7 @@ rules: dangerous-triggers: ignore: - documentation-links.yml + unpinned-uses: + config: + policies: + "*": ref-pin diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c77030ca5fc658..d641a7f81360ba 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -61,7 +61,7 @@ repos: - id: actionlint - repo: https://github.com/woodruffw/zizmor-pre-commit - rev: v1.1.1 + rev: v1.6.0 hooks: - id: zizmor From 12f77ca9261c2b9916ffbe47bfbf3df333cecd3b Mon Sep 17 00:00:00 2001 From: sobolevn Date: Tue, 22 Apr 2025 16:14:55 +0300 Subject: [PATCH 2/3] Update other `pre-commit` repos --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d641a7f81360ba..048cff1d32c7af 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.4 + rev: v0.11.6 hooks: - id: ruff name: Run Ruff (lint) on Doc/ @@ -24,7 +24,7 @@ repos: files: ^Doc/ - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.10.0 + rev: 25.1.0 hooks: - id: black name: Run Black on Tools/build/check_warnings.py @@ -49,7 +49,7 @@ repos: types_or: [c, inc, python, rst] - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.31.0 + rev: 0.33.0 hooks: - id: check-dependabot - id: check-github-workflows From 420edd867d6dafe7c5d3fb9a24a3e1d7eb832ec7 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Tue, 22 Apr 2025 16:20:33 +0300 Subject: [PATCH 3/3] Apply changes --- Tools/jit/_stencils.py | 8 +++++--- Tools/jit/_targets.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Tools/jit/_stencils.py b/Tools/jit/_stencils.py index 8faa9e8cac2d85..22d3014351df90 100644 --- a/Tools/jit/_stencils.py +++ b/Tools/jit/_stencils.py @@ -238,7 +238,7 @@ def remove_jump(self) -> None: addend=-4, ) as hole: # jmp qword ptr [rip] - jump = b"\x48\xFF\x25\x00\x00\x00\x00" + jump = b"\x48\xff\x25\x00\x00\x00\x00" offset -= 3 case Hole( offset=offset, @@ -246,9 +246,11 @@ def remove_jump(self) -> None: value=HoleValue.CONTINUE, symbol=None, addend=addend, - ) as hole if _signed(addend) == -4: + ) as hole if ( + _signed(addend) == -4 + ): # jmp 5 - jump = b"\xE9\x00\x00\x00\x00" + jump = b"\xe9\x00\x00\x00\x00" offset -= 1 case Hole( offset=offset, diff --git a/Tools/jit/_targets.py b/Tools/jit/_targets.py index b3b065652e0bb0..f7ea159884c5a4 100644 --- a/Tools/jit/_targets.py +++ b/Tools/jit/_targets.py @@ -46,7 +46,7 @@ class _Target(typing.Generic[_S, _R]): def _get_nop(self) -> bytes: if re.fullmatch(r"aarch64-.*", self.triple): - nop = b"\x1f\x20\x03\xD5" + nop = b"\x1f\x20\x03\xd5" elif re.fullmatch(r"x86_64-.*|i686.*", self.triple): nop = b"\x90" else: