Skip to content

[release/6.0] Fix incorrect tracking of sign bit in BigInteger #59951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 6, 2021
Merged

[release/6.0] Fix incorrect tracking of sign bit in BigInteger #59951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
640c080
Fix incorrect tracking of sign bit
wzchua Sep 23, 2021
4081de7
Perform the 1 check earlier
wzchua Sep 23, 2021
e115f40
Add comment on checking special pattern
wzchua Sep 25, 2021
6f8e440
Simplify fix
wzchua Sep 25, 2021
538587c
Update the test to target 32 bit right shift as the logic has been re…
wzchua Sep 25, 2021
5f1bace
Remove stray newline
wzchua Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/libraries/System.Runtime.Numerics/src/System/Numerics/BigInteger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2021,10 +2021,14 @@ public static explicit operator decimal(BigInteger value)
}

NumericsHelpers.DangerousMakeTwosComplement(xd); // Mutates xd
if (xd[^1] == 0)
{
trackSignBit = true;
}

// For a shift of N x 32 bit,
// We check for a special case where its sign bit could be outside the uint array after 2's complement conversion.
// For example given [0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF], its 2's complement is [0x01, 0x00, 0x00]
// After a 32 bit right shift, it becomes [0x00, 0x00] which is [0x00, 0x00] when converted back.
// The expected result is [0x00, 0x00, 0xFFFFFFFF] (2's complement) or [0x00, 0x00, 0x01] when converted back
// If the 2's component's last element is a 0, we will track the sign externally
trackSignBit = smallShift == 0 && xd[^1] == 0;
}

int zl = xd.Length - digitShift + (trackSignBit ? 1: 0);
Expand Down Expand Up @@ -2061,12 +2065,12 @@ stackalloc uint[StackallocUInt32Limit].Slice(0, zl) :
}
if (negx)
{
NumericsHelpers.DangerousMakeTwosComplement(zd); // Mutates zd

// Set the tracked sign to the last element
if (trackSignBit)
{
zd[^1] = 1;
zd[^1] = 0xFFFFFFFF;
}
NumericsHelpers.DangerousMakeTwosComplement(zd); // Mutates zd
}

return new BigInteger(zd, zdArray, negx);
Expand Down
17 changes: 17 additions & 0 deletions src/libraries/System.Runtime.Numerics/tests/BigInteger/op_rightshift.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@ public static void RunRightShiftTests()
VerifyRightShiftString(Print(tempByteArray2) + Print(tempByteArray1) + "b>>");
}

// RightShift Method - Uint 0xffffffff 0x8000000 ... Large BigIntegers - 32 bit Shift
for (int i = 0; i < s_samples; i++)
{
tempByteArray1 = GetRandomLengthFirstUIntMaxSecondUIntMSBMaxArray(s_random);
tempByteArray2 = new byte[] { (byte)32 };
VerifyRightShiftString(Print(tempByteArray2) + Print(tempByteArray1) + "b>>");
}

// RightShift Method - Large BigIntegers - large - Shift
for (int i = 0; i < s_samples; i++)
{
Expand Down Expand Up @@ -229,6 +237,15 @@ private static byte[] GetRandomLengthAllOnesUIntByteArray(Random random)
array[^1] = 0xFF;
return array;
}
private static byte[] GetRandomLengthFirstUIntMaxSecondUIntMSBMaxArray(Random random)
{
int gap = random.Next(0, 128);
int byteLength = 4 + gap * 4 + 1;
byte[] array = new byte[byteLength];
array[^6] = 0x80;
array[^1] = 0xFF;
return array;
}

private static string Print(byte[] bytes)
{
Expand Down