From 55e29a6100eb4aa89c3f510d4335b953364dd74e Mon Sep 17 00:00:00 2001 From: Brandt Bucher Date: Tue, 16 Sep 2025 11:29:09 +0100 Subject: [PATCH] GH-129805: Clean up some changes from GH-129806 (GH-133540) --- Tools/jit/_stencils.py | 6 +----- Tools/jit/_targets.py | 17 ++++------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/Tools/jit/_stencils.py b/Tools/jit/_stencils.py index 1d82f5366f6c..14606b036db5 100644 --- a/Tools/jit/_stencils.py +++ b/Tools/jit/_stencils.py @@ -137,11 +137,7 @@ class Hole: def __post_init__(self) -> None: self.func = _PATCH_FUNCS[self.kind] - def fold( - self, - other: typing.Self, - body: bytes | bytearray, - ) -> typing.Self | None: + def fold(self, other: typing.Self, body: bytearray) -> typing.Self | None: """Combine two holes into a single hole, if possible.""" instruction_a = int.from_bytes( body[self.offset : self.offset + 4], byteorder=sys.byteorder diff --git a/Tools/jit/_targets.py b/Tools/jit/_targets.py index c3ce24643fd4..2185d8190a89 100644 --- a/Tools/jit/_targets.py +++ b/Tools/jit/_targets.py @@ -119,7 +119,7 @@ class _Target(typing.Generic[_S, _R]): raise NotImplementedError(type(self)) def _handle_relocation( - self, base: int, relocation: _R, raw: bytes | bytearray + self, base: int, relocation: _R, raw: bytearray ) -> _stencils.Hole: raise NotImplementedError(type(self)) @@ -297,10 +297,7 @@ class _COFF( return _stencils.symbol_to_value(name) def _handle_relocation( - self, - base: int, - relocation: _schema.COFFRelocation, - raw: bytes | bytearray, + self, base: int, relocation: _schema.COFFRelocation, raw: bytearray ) -> _stencils.Hole: match relocation: case { @@ -410,10 +407,7 @@ class _ELF( }, section_type def _handle_relocation( - self, - base: int, - relocation: _schema.ELFRelocation, - raw: bytes | bytearray, + self, base: int, relocation: _schema.ELFRelocation, raw: bytearray ) -> _stencils.Hole: symbol: str | None match relocation: @@ -492,10 +486,7 @@ class _MachO( stencil.holes.append(hole) def _handle_relocation( - self, - base: int, - relocation: _schema.MachORelocation, - raw: bytes | bytearray, + self, base: int, relocation: _schema.MachORelocation, raw: bytearray ) -> _stencils.Hole: symbol: str | None match relocation: -- 2.47.3