Skip to content

Commit 94157b0

Browse files
jozkeeCopilot
andauthored
[System.Text.Json] Fix ARM64 Utf8JsonReader regression (#132452)
Fixes #131600. Restore the explicit comparison form for the number terminator check in `Utf8JsonReader.TryGetNumber`. The pattern-matching form is semantically equivalent, but introduced a large Linux ARM64 regression in `System.Text.Json.Tests.Perf_Get.GetUInt64`. ## Performance EgorBot on an Azure Ampere ARM64 machine measured the regressed pattern form against the selectively restored reader code: | State | Mean | Ratio | |---|---:|---:| | Pattern form (`43560bc7`) | 900.8 ns | 1.00 | | Restored reader comparisons | 515.4 ns | 0.57 | The cumulative bisection further narrowed the transition from 515.6 ns at `fa936cfa` to approximately 896 ns after this condition changed. The intervening commits only modify `Debug.Assert` expressions in Release builds. Results: - EgorBot/Benchmarks#508 (comment) - EgorBot/Benchmarks#509 (comment) > [!NOTE] > This pull request description was prepared with GitHub Copilot. --------- Co-authored-by: Copilot <[email protected]>
1 parent 6d0c10d commit 94157b0

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

‎src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.MultiSegment.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ private bool TryGetNumberMultiSegment(ReadOnlySpan<byte> data, out int consumed)
11741174

11751175
Debug.Assert(result == ConsumeNumberResult.OperationIncomplete);
11761176
nextByte = data[i];
1177-
if (nextByte is not ((byte)'.' or (byte)'E' or (byte)'e'))
1177+
if (nextByte != '.' && nextByte != 'E' && nextByte != 'e')
11781178
{
11791179
RollBackState(rollBackState, isError: true);
11801180
ThrowHelper.ThrowJsonReaderException(ref this, ExceptionResource.ExpectedEndOfDigitNotFound, nextByte);
@@ -1200,7 +1200,7 @@ private bool TryGetNumberMultiSegment(ReadOnlySpan<byte> data, out int consumed)
12001200

12011201
Debug.Assert(result == ConsumeNumberResult.OperationIncomplete);
12021202
nextByte = data[i];
1203-
if (nextByte is not ((byte)'E' or (byte)'e'))
1203+
if (nextByte != 'E' && nextByte != 'e')
12041204
{
12051205
RollBackState(rollBackState, isError: true);
12061206
ThrowHelper.ThrowJsonReaderException(ref this, ExceptionResource.ExpectedNextDigitEValueNotFound, nextByte);
@@ -1341,7 +1341,7 @@ private ConsumeNumberResult ConsumeZeroMultiSegment(ref ReadOnlySpan<byte> data,
13411341
}
13421342
}
13431343
nextByte = data[i];
1344-
if (nextByte is not ((byte)'.' or (byte)'E' or (byte)'e'))
1344+
if (nextByte != '.' && nextByte != 'E' && nextByte != 'e')
13451345
{
13461346
RollBackState(rollBackState, isError: true);
13471347
ThrowHelper.ThrowJsonReaderException(ref this,
@@ -1490,7 +1490,7 @@ private ConsumeNumberResult ConsumeSignMultiSegment(ref ReadOnlySpan<byte> data,
14901490
}
14911491

14921492
byte nextByte = data[i];
1493-
if (nextByte is (byte)'+' or (byte)'-')
1493+
if (nextByte == '+' || nextByte == '-')
14941494
{
14951495
i++;
14961496
_bytePositionInLine++;
@@ -2264,7 +2264,7 @@ private bool SkipCommentMultiSegment(out int tailBytesToIgnore)
22642264
}
22652265

22662266
byte marker = localBuffer[0];
2267-
if (marker is not (JsonConstants.Slash or JsonConstants.Asterisk))
2267+
if (marker != JsonConstants.Slash && marker != JsonConstants.Asterisk)
22682268
{
22692269
ThrowHelper.ThrowJsonReaderException(ref this, ExceptionResource.InvalidCharacterAtStartOfComment, marker);
22702270
}

‎src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,7 @@ private bool TryGetNumber(ReadOnlySpan<byte> data, out int consumed)
15051505

15061506
Debug.Assert(result == ConsumeNumberResult.OperationIncomplete);
15071507
nextByte = data[i];
1508-
if (nextByte is not ((byte)'.' or (byte)'E' or (byte)'e'))
1508+
if (nextByte != '.' && nextByte != 'E' && nextByte != 'e')
15091509
{
15101510
_bytePositionInLine += i;
15111511
ThrowHelper.ThrowJsonReaderException(ref this, ExceptionResource.ExpectedEndOfDigitNotFound, nextByte);
@@ -1529,7 +1529,7 @@ private bool TryGetNumber(ReadOnlySpan<byte> data, out int consumed)
15291529

15301530
Debug.Assert(result == ConsumeNumberResult.OperationIncomplete);
15311531
nextByte = data[i];
1532-
if (nextByte is not ((byte)'E' or (byte)'e'))
1532+
if (nextByte != 'E' && nextByte != 'e')
15331533
{
15341534
_bytePositionInLine += i;
15351535
ThrowHelper.ThrowJsonReaderException(ref this, ExceptionResource.ExpectedNextDigitEValueNotFound, nextByte);
@@ -1624,7 +1624,7 @@ private ConsumeNumberResult ConsumeZero(ref ReadOnlySpan<byte> data, scoped ref
16241624
}
16251625
}
16261626
nextByte = data[i];
1627-
if (nextByte is not ((byte)'.' or (byte)'E' or (byte)'e'))
1627+
if (nextByte != '.' && nextByte != 'E' && nextByte != 'e')
16281628
{
16291629
_bytePositionInLine += i;
16301630
ThrowHelper.ThrowJsonReaderException(ref this,
@@ -1703,7 +1703,7 @@ private ConsumeNumberResult ConsumeSign(ref ReadOnlySpan<byte> data, scoped ref
17031703
}
17041704

17051705
byte nextByte = data[i];
1706-
if (nextByte is (byte)'+' or (byte)'-')
1706+
if (nextByte == '+' || nextByte == '-')
17071707
{
17081708
i++;
17091709
if (i >= data.Length)

‎src/libraries/System.Text.Json/src/System/Text/Json/Writer/JsonWriterHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ internal static void ValidateNumber(ReadOnlySpan<byte> utf8FormattedNumber)
212212
val = utf8FormattedNumber[i];
213213
}
214214

215-
if (val is (byte)'e' or (byte)'E')
215+
if (val == 'e' || val == 'E')
216216
{
217217
i++;
218218

@@ -223,7 +223,7 @@ internal static void ValidateNumber(ReadOnlySpan<byte> utf8FormattedNumber)
223223

224224
val = utf8FormattedNumber[i];
225225

226-
if (val is (byte)'+' or (byte)'-')
226+
if (val == '+' || val == '-')
227227
{
228228
i++;
229229
}

0 commit comments

Comments
 (0)