Remove unnecessary local variables where base address is only used once

Copilot · HMBSbige · Copilot · commit 7d49d823e4ae · 2025-10-27T12:33:44.000Z
Co-authored-by: HMBSbige &lt;19153265+HMBSbige@users.noreply.github.com&gt;
diff --git a/src/CryptoBase/FastUtils.cs b/src/CryptoBase/FastUtils.cs
@@ -205,25 +205,17 @@ public static void Xor16(ReadOnlySpan<byte> stream, ReadOnlySpan<byte> source, S
 	{
 		if (Vector128.IsHardwareAccelerated)
 		{
-			ref byte streamRef = ref stream.GetReference();
-			ref byte sourceRef = ref source.GetReference();
-			ref byte destRef = ref destination.GetReference();
-
-			ref Vector128<byte> v0 = ref Unsafe.As<byte, Vector128<byte>>(ref streamRef);
-			ref Vector128<byte> v1 = ref Unsafe.As<byte, Vector128<byte>>(ref sourceRef);
-			ref Vector128<byte> dst = ref Unsafe.As<byte, Vector128<byte>>(ref destRef);
+			ref Vector128<byte> v0 = ref Unsafe.As<byte, Vector128<byte>>(ref stream.GetReference());
+			ref Vector128<byte> v1 = ref Unsafe.As<byte, Vector128<byte>>(ref source.GetReference());
+			ref Vector128<byte> dst = ref Unsafe.As<byte, Vector128<byte>>(ref destination.GetReference());
 
 			dst = v0 ^ v1;
 		}
 		else
 		{
-			ref byte streamRef = ref stream.GetReference();
-			ref byte sourceRef = ref source.GetReference();
-			ref byte destRef = ref destination.GetReference();
-
-			ref UInt128 v0 = ref Unsafe.As<byte, UInt128>(ref streamRef);
-			ref UInt128 v1 = ref Unsafe.As<byte, UInt128>(ref sourceRef);
-			ref UInt128 dst = ref Unsafe.As<byte, UInt128>(ref destRef);
+			ref UInt128 v0 = ref Unsafe.As<byte, UInt128>(ref stream.GetReference());
+			ref UInt128 v1 = ref Unsafe.As<byte, UInt128>(ref source.GetReference());
+			ref UInt128 dst = ref Unsafe.As<byte, UInt128>(ref destination.GetReference());
 
 			dst = v0 ^ v1;
 		}
@@ -237,21 +229,15 @@ public static void Xor16(Span<byte> source, ReadOnlySpan<byte> stream)
 	{
 		if (Vector128.IsHardwareAccelerated)
 		{
-			ref byte sourceRef = ref source.GetReference();
-			ref byte streamRef = ref stream.GetReference();
-
-			ref Vector128<byte> v0 = ref Unsafe.As<byte, Vector128<byte>>(ref sourceRef);
-			ref Vector128<byte> v1 = ref Unsafe.As<byte, Vector128<byte>>(ref streamRef);
+			ref Vector128<byte> v0 = ref Unsafe.As<byte, Vector128<byte>>(ref source.GetReference());
+			ref Vector128<byte> v1 = ref Unsafe.As<byte, Vector128<byte>>(ref stream.GetReference());
 
 			v0 ^= v1;
 		}
 		else
 		{
-			ref byte sourceRef = ref source.GetReference();
-			ref byte streamRef = ref stream.GetReference();
-
-			ref UInt128 v0 = ref Unsafe.As<byte, UInt128>(ref sourceRef);
-			ref UInt128 v1 = ref Unsafe.As<byte, UInt128>(ref streamRef);
+			ref UInt128 v0 = ref Unsafe.As<byte, UInt128>(ref source.GetReference());
+			ref UInt128 v1 = ref Unsafe.As<byte, UInt128>(ref stream.GetReference());
 
 			v0 ^= v1;
 		}
diff --git a/src/CryptoBase/Macs/GHash/GHashX86.cs b/src/CryptoBase/Macs/GHash/GHashX86.cs
@@ -18,8 +18,7 @@ public GHashX86(scoped ReadOnlySpan<byte> key)
 	{
 		ArgumentOutOfRangeException.ThrowIfLessThan(key.Length, KeySize, nameof(key));
 
-		ref byte keyRef = ref key.GetReference();
-		ref Vector128<byte> v = ref Unsafe.As<byte, Vector128<byte>>(ref keyRef);
+		ref Vector128<byte> v = ref Unsafe.As<byte, Vector128<byte>>(ref key.GetReference());
 		_key = v.ReverseEndianness128();
 
 		Reset();
@@ -29,8 +28,7 @@ public GHashX86(scoped ReadOnlySpan<byte> key)
 	private void GFMul(scoped ReadOnlySpan<byte> x)
 	{
 		Vector128<ulong> a = _key.AsUInt64();
-		ref byte xRef = ref x.GetReference();
-		Vector128<ulong> b = (Unsafe.As<byte, Vector128<byte>>(ref xRef).ReverseEndianness128() ^ _buffer).AsUInt64();
+		Vector128<ulong> b = (Unsafe.As<byte, Vector128<byte>>(ref x.GetReference()).ReverseEndianness128() ^ _buffer).AsUInt64();
 
 		Vector128<uint> tmp3 = Pclmulqdq.CarrylessMultiply(a, b, 0x00).AsUInt32();
 		Vector128<uint> tmp4 = Pclmulqdq.CarrylessMultiply(a, b, 0x10).AsUInt32();
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamMode.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamMode.cs
@@ -54,8 +54,7 @@ private void UpdateCore(ReadOnlySpan<byte> source, Span<byte> destination)
 			{
 				crypto.Encrypt(counter, stream);
 
-				ref byte counterRef = ref counter.GetReference();
-				ref UInt128 c = ref Unsafe.As<byte, UInt128>(ref counterRef);
+				ref UInt128 c = ref Unsafe.As<byte, UInt128>(ref counter.GetReference());
 				c = BinaryPrimitives.ReverseEndianness(BinaryPrimitives.ReverseEndianness(c) + 1);
 			}
 
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock16X86.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock16X86.cs
@@ -35,8 +35,7 @@ public CTR128StreamModeBlock16X86(IBlockCrypto crypto, ReadOnlySpan<byte> iv)
 		_counter = ArrayPool<byte>.Shared.Rent(BlockSize16);
 		_keyStream = ArrayPool<byte>.Shared.Rent(BlockSize16);
 
-		ref byte ivRef = ref iv.GetReference();
-		_iCounter = FastUtils.BroadcastVector128ToVector256(ref ivRef).ReverseEndianness128().IncUpper128Le();
+		_iCounter = FastUtils.BroadcastVector128ToVector256(ref iv.GetReference()).ReverseEndianness128().IncUpper128Le();
 
 		Reset();
 	}
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock4X86.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock4X86.cs
@@ -32,8 +32,7 @@ public CTR128StreamModeBlock4X86(IBlockCrypto crypto, ReadOnlySpan<byte> iv)
 		_counter = ArrayPool<byte>.Shared.Rent(BlockSize4);
 		_keyStream = ArrayPool<byte>.Shared.Rent(BlockSize4);
 
-		ref byte ivRef = ref iv.GetReference();
-		ref Vector128<byte> v = ref Unsafe.As<byte, Vector128<byte>>(ref ivRef);
+		ref Vector128<byte> v = ref Unsafe.As<byte, Vector128<byte>>(ref iv.GetReference());
 		_iCounter = v.ReverseEndianness128();
 
 		Reset();
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock8AvxX86.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock8AvxX86.cs
@@ -32,8 +32,7 @@ public CTR128StreamModeBlock8AvxX86(IBlockCrypto crypto, ReadOnlySpan<byte> iv)
 		_counter = ArrayPool<byte>.Shared.Rent(BlockSize8);
 		_keyStream = ArrayPool<byte>.Shared.Rent(BlockSize8);
 
-		ref byte ivRef = ref iv.GetReference();
-		_iCounter = FastUtils.BroadcastVector128ToVector256(ref ivRef).ReverseEndianness128().IncUpper128Le();
+		_iCounter = FastUtils.BroadcastVector128ToVector256(ref iv.GetReference()).ReverseEndianness128().IncUpper128Le();
 
 		Reset();
 	}
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock8X86.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeBlock8X86.cs
@@ -35,8 +35,7 @@ public CTR128StreamModeBlock8X86(IBlockCrypto crypto, ReadOnlySpan<byte> iv)
 		_counter = ArrayPool<byte>.Shared.Rent(BlockSize8);
 		_keyStream = ArrayPool<byte>.Shared.Rent(BlockSize8);
 
-		ref byte ivRef = ref iv.GetReference();
-		ref Vector128<byte> v = ref Unsafe.As<byte, Vector128<byte>>(ref ivRef);
+		ref Vector128<byte> v = ref Unsafe.As<byte, Vector128<byte>>(ref iv.GetReference());
 		_iCounter = v.ReverseEndianness128();
 
 		Reset();
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeX86.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/CTR/CTR128StreamModeX86.cs
@@ -22,8 +22,7 @@ public CTR128StreamModeX86(IBlockCrypto crypto, ReadOnlySpan<byte> iv)
 
 		_internalBlockCrypto = crypto;
 
-		ref byte ivRef = ref iv.GetReference();
-		ref Vector128<byte> v = ref Unsafe.As<byte, Vector128<byte>>(ref ivRef);
+		ref Vector128<byte> v = ref Unsafe.As<byte, Vector128<byte>>(ref iv.GetReference());
 		_iCounter = v.ReverseEndianness128();
 
 		Reset();
diff --git a/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/Xts/XtsMode.cs b/src/CryptoBase/SymmetricCryptos/BlockCryptoModes/Xts/XtsMode.cs
@@ -21,8 +21,7 @@ public XtsMode(IBlockCrypto dataCrypto, IBlockCrypto tweakCrypto, ReadOnlySpan<b
 
 		_dataCrypto = dataCrypto;
 		_tweakCrypto = tweakCrypto;
-		ref byte ivRef = ref iv.GetReference();
-		_iv = Unsafe.ReadUnaligned<Vector128<byte>>(ref ivRef);
+		_iv = Unsafe.ReadUnaligned<Vector128<byte>>(ref iv.GetReference());
 	}
 
 	[SkipLocalsInit]
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/ChaCha20Utils.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/ChaCha20Utils.cs
@@ -136,8 +136,7 @@ public static void UpdateKeyStream(Span<uint> state, Span<byte> stream, byte rou
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static void IncrementCounterOriginal(Span<uint> state)
 	{
-		ref uint stateRef = ref state.GetReference();
-		++Unsafe.As<uint, ulong>(ref Unsafe.Add(ref stateRef, 12));
+		++Unsafe.As<uint, ulong>(ref Unsafe.Add(ref state.GetReference(), 12));
 	}
 
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/Salsa20Crypto.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/Salsa20Crypto.cs
@@ -6,7 +6,6 @@ public abstract class Salsa20Crypto : SnuffleCrypto
 
 	protected override void IncrementCounter(Span<uint> state)
 	{
-		ref uint stateRef = ref state.GetReference();
-		++Unsafe.As<uint, ulong>(ref Unsafe.Add(ref stateRef, 8));
+		++Unsafe.As<uint, ulong>(ref Unsafe.Add(ref state.GetReference(), 8));
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -205,25 +205,17 @@ public static void Xor16(ReadOnlySpan<byte> stream, ReadOnlySpan<byte> source, S`
`205`	`205`	`{`
`206`	`206`	`if (Vector128.IsHardwareAccelerated)`
`207`	`207`	`{`
`208`		`- ref byte streamRef = ref stream.GetReference();`
`209`		`- ref byte sourceRef = ref source.GetReference();`
`210`		`- ref byte destRef = ref destination.GetReference();`
`211`		`-`
`212`		`- ref Vector128<byte> v0 = ref Unsafe.As<byte, Vector128<byte>>(ref streamRef);`
`213`		`- ref Vector128<byte> v1 = ref Unsafe.As<byte, Vector128<byte>>(ref sourceRef);`
`214`		`- ref Vector128<byte> dst = ref Unsafe.As<byte, Vector128<byte>>(ref destRef);`
	`208`	`+ ref Vector128<byte> v0 = ref Unsafe.As<byte, Vector128<byte>>(ref stream.GetReference());`
	`209`	`+ ref Vector128<byte> v1 = ref Unsafe.As<byte, Vector128<byte>>(ref source.GetReference());`
	`210`	`+ ref Vector128<byte> dst = ref Unsafe.As<byte, Vector128<byte>>(ref destination.GetReference());`
`215`	`211`
`216`	`212`	`dst = v0 ^ v1;`
`217`	`213`	`}`
`218`	`214`	`else`
`219`	`215`	`{`
`220`		`- ref byte streamRef = ref stream.GetReference();`
`221`		`- ref byte sourceRef = ref source.GetReference();`
`222`		`- ref byte destRef = ref destination.GetReference();`
`223`		`-`
`224`		`- ref UInt128 v0 = ref Unsafe.As<byte, UInt128>(ref streamRef);`
`225`		`- ref UInt128 v1 = ref Unsafe.As<byte, UInt128>(ref sourceRef);`
`226`		`- ref UInt128 dst = ref Unsafe.As<byte, UInt128>(ref destRef);`
	`216`	`+ ref UInt128 v0 = ref Unsafe.As<byte, UInt128>(ref stream.GetReference());`
	`217`	`+ ref UInt128 v1 = ref Unsafe.As<byte, UInt128>(ref source.GetReference());`
	`218`	`+ ref UInt128 dst = ref Unsafe.As<byte, UInt128>(ref destination.GetReference());`
`227`	`219`
`228`	`220`	`dst = v0 ^ v1;`
`229`	`221`	`}`
`@@ -237,21 +229,15 @@ public static void Xor16(Span<byte> source, ReadOnlySpan<byte> stream)`
`237`	`229`	`{`
`238`	`230`	`if (Vector128.IsHardwareAccelerated)`
`239`	`231`	`{`
`240`		`- ref byte sourceRef = ref source.GetReference();`
`241`		`- ref byte streamRef = ref stream.GetReference();`
`242`		`-`
`243`		`- ref Vector128<byte> v0 = ref Unsafe.As<byte, Vector128<byte>>(ref sourceRef);`
`244`		`- ref Vector128<byte> v1 = ref Unsafe.As<byte, Vector128<byte>>(ref streamRef);`
	`232`	`+ ref Vector128<byte> v0 = ref Unsafe.As<byte, Vector128<byte>>(ref source.GetReference());`
	`233`	`+ ref Vector128<byte> v1 = ref Unsafe.As<byte, Vector128<byte>>(ref stream.GetReference());`
`245`	`234`
`246`	`235`	`v0 ^= v1;`
`247`	`236`	`}`
`248`	`237`	`else`
`249`	`238`	`{`
`250`		`- ref byte sourceRef = ref source.GetReference();`
`251`		`- ref byte streamRef = ref stream.GetReference();`
`252`		`-`
`253`		`- ref UInt128 v0 = ref Unsafe.As<byte, UInt128>(ref sourceRef);`
`254`		`- ref UInt128 v1 = ref Unsafe.As<byte, UInt128>(ref streamRef);`
	`239`	`+ ref UInt128 v0 = ref Unsafe.As<byte, UInt128>(ref source.GetReference());`
	`240`	`+ ref UInt128 v1 = ref Unsafe.As<byte, UInt128>(ref stream.GetReference());`
`255`	`241`
`256`	`242`	`v0 ^= v1;`
`257`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,7 @@ private void UpdateCore(ReadOnlySpan<byte> source, Span<byte> destination)`
`54`	`54`	`{`
`55`	`55`	`crypto.Encrypt(counter, stream);`
`56`	`56`
`57`		`- ref byte counterRef = ref counter.GetReference();`
`58`		`- ref UInt128 c = ref Unsafe.As<byte, UInt128>(ref counterRef);`
	`57`	`+ ref UInt128 c = ref Unsafe.As<byte, UInt128>(ref counter.GetReference());`
`59`	`58`	`c = BinaryPrimitives.ReverseEndianness(BinaryPrimitives.ReverseEndianness(c) + 1);`
`60`	`59`	`}`
`61`	`60`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ public CTR128StreamModeBlock16X86(IBlockCrypto crypto, ReadOnlySpan<byte> iv)`
`35`	`35`	`_counter = ArrayPool<byte>.Shared.Rent(BlockSize16);`
`36`	`36`	`_keyStream = ArrayPool<byte>.Shared.Rent(BlockSize16);`
`37`	`37`
`38`		`- ref byte ivRef = ref iv.GetReference();`
`39`		`- _iCounter = FastUtils.BroadcastVector128ToVector256(ref ivRef).ReverseEndianness128().IncUpper128Le();`
	`38`	`+ _iCounter = FastUtils.BroadcastVector128ToVector256(ref iv.GetReference()).ReverseEndianness128().IncUpper128Le();`
`40`	`39`
`41`	`40`	`Reset();`
`42`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,7 @@ public CTR128StreamModeBlock8AvxX86(IBlockCrypto crypto, ReadOnlySpan<byte> iv)`
`32`	`32`	`_counter = ArrayPool<byte>.Shared.Rent(BlockSize8);`
`33`	`33`	`_keyStream = ArrayPool<byte>.Shared.Rent(BlockSize8);`
`34`	`34`
`35`		`- ref byte ivRef = ref iv.GetReference();`
`36`		`- _iCounter = FastUtils.BroadcastVector128ToVector256(ref ivRef).ReverseEndianness128().IncUpper128Le();`
	`35`	`+ _iCounter = FastUtils.BroadcastVector128ToVector256(ref iv.GetReference()).ReverseEndianness128().IncUpper128Le();`
`37`	`36`
`38`	`37`	`Reset();`
`39`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ public XtsMode(IBlockCrypto dataCrypto, IBlockCrypto tweakCrypto, ReadOnlySpan<b`
`21`	`21`
`22`	`22`	`_dataCrypto = dataCrypto;`
`23`	`23`	`_tweakCrypto = tweakCrypto;`
`24`		`- ref byte ivRef = ref iv.GetReference();`
`25`		`- _iv = Unsafe.ReadUnaligned<Vector128<byte>>(ref ivRef);`
	`24`	`+ _iv = Unsafe.ReadUnaligned<Vector128<byte>>(ref iv.GetReference());`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`[SkipLocalsInit]`
Original file line number	Diff line number	Diff line change
`@@ -136,8 +136,7 @@ public static void UpdateKeyStream(Span<uint> state, Span<byte> stream, byte rou`
`136`	`136`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`137`	`137`	`public static void IncrementCounterOriginal(Span<uint> state)`
`138`	`138`	`{`
`139`		`- ref uint stateRef = ref state.GetReference();`
`140`		`- ++Unsafe.As<uint, ulong>(ref Unsafe.Add(ref stateRef, 12));`
	`139`	`+ ++Unsafe.As<uint, ulong>(ref Unsafe.Add(ref state.GetReference(), 12));`
`141`	`140`	`}`
`142`	`141`
`143`	`142`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`