Refactor BigIntegerCalculator.*ShiftSelf

Author: kzrnm

src/libraries/System.Runtime.Numerics/src/System/Numerics/BigInteger.cs

@@ -2533,8 +2533,7 @@ public static implicit operator BigInteger(nuint value)
 
             bits.CopyTo(zd);
 
-            uint carry = 0;
-            BigIntegerCalculator.LeftShiftSelf(zd, smallShift, ref carry);
+            uint carry = BigIntegerCalculator.LeftShiftSelf(zd, smallShift);
 
             Debug.Assert(carry == over);
             Debug.Assert(z[^1] != 0);
@@ -2612,8 +2611,7 @@ private static BigInteger LeftShift(int value, int digitShift, int smallShift)
             zd[^1] = 0;
             bits.Slice(digitShift).CopyTo(zd);
 
-            uint carry = 0;
-            BigIntegerCalculator.RightShiftSelf(zd, smallShift, ref carry);
+            uint carry = BigIntegerCalculator.RightShiftSelf(zd, smallShift);
 
             bool neg = value._sign < 0;
             if (neg && (carry != 0 || bits.Slice(0, digitShift).ContainsAnyExcept(0u)))
@@ -5088,8 +5086,7 @@ static bool INumberBase<BigInteger>.TryConvertToTruncating<TOther>(BigInteger va
                 }
             }
 
-            uint carry = 0;
-            BigIntegerCalculator.RightShiftSelf(zd, smallShift, ref carry);
+            BigIntegerCalculator.RightShiftSelf(zd, smallShift);
 
             BigInteger result = new BigInteger(zd, false);
 

src/libraries/System.Runtime.Numerics/src/System/Numerics/BigIntegerCalculator.ShiftRot.cs

@@ -39,8 +39,7 @@ public static void RotateLeft(Span<uint> bits, int digitShift, int smallShift)
         {
             Debug.Assert(bits.Length > 0);
 
-            uint carry = 0;
-            LeftShiftSelf(bits, smallShift, ref carry);
+            uint carry = LeftShiftSelf(bits, smallShift);
             bits[0] |= carry;
 
             if (digitShift == 0)
@@ -53,8 +52,7 @@ public static void RotateRight(Span<uint> bits, int digitShift, int smallShift)
         {
             Debug.Assert(bits.Length > 0);
 
-            uint carry = 0;
-            RightShiftSelf(bits, smallShift, ref carry);
+            uint carry = RightShiftSelf(bits, smallShift);
             bits[^1] |= carry;
 
             if (digitShift == 0)
@@ -98,33 +96,37 @@ stackalloc uint[StackAllocThreshold]
                 ArrayPool<uint>.Shared.Return(tmpFromPool);
         }
 
-        public static void LeftShiftSelf(Span<uint> bits, int shift, ref uint carry)
+        public static uint LeftShiftSelf(Span<uint> bits, int shift)
         {
             Debug.Assert((uint)shift < 32);
             if (shift == 0)
-                return;
+                return 0;
 
+            uint carry = 0;
             int back = 32 - shift;
             for (int i = 0; i < bits.Length; i++)
             {
                 uint value = carry | bits[i] << shift;
                 carry = bits[i] >> back;
                 bits[i] = value;
             }
+            return carry;
         }
-        public static void RightShiftSelf(Span<uint> bits, int shift, ref uint carry)
+        public static uint RightShiftSelf(Span<uint> bits, int shift)
         {
             Debug.Assert((uint)shift < 32);
             if (shift == 0)
-                return;
+                return 0;
 
+            uint carry = 0;
             int back = 32 - shift;
             for (int i = bits.Length - 1; i >= 0; i--)
             {
                 uint value = carry | bits[i] >> shift;
                 carry = bits[i] << back;
                 bits[i] = value;
             }
+            return carry;
         }
     }
 }