Skip to content

Speed up surrogate validation in string.Normalize #110574

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 2 commits into from
Dec 10, 2024
Merged

Speed up surrogate validation in string.Normalize #110574

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ef7b28
Speed up surrogate validation in string.Normalize
MihaZupan Dec 10, 2024
f56d6b2
Remove the else block
MihaZupan Dec 10, 2024
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
13 changes: 8 additions & 5 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/Normalization.Icu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,20 @@ private static void ValidateArguments(ReadOnlySpan<char> strInput, Normalization
/// </summary>
private static bool HasInvalidUnicodeSequence(ReadOnlySpan<char> s)
{
for (int i = 0; i < s.Length; i++)
const char Noncharacter = '\uFFFE';

int i = s.IndexOfAnyInRange(CharUnicodeInfo.HIGH_SURROGATE_START, Noncharacter);

for (; (uint)i < (uint)s.Length; i++)
{
char c = s[i];

if (c < '\ud800')
if (c < CharUnicodeInfo.HIGH_SURROGATE_START)
{
continue;
}

if (c == '\uFFFE')
if (c == Noncharacter)
{
return true;
}
Expand All @@ -240,7 +244,7 @@ private static bool HasInvalidUnicodeSequence(ReadOnlySpan<char> s)

if (char.IsHighSurrogate(c))
{
if (i + 1 >= s.Length || !char.IsLowSurrogate(s[i + 1]))
if ((uint)(i + 1) >= (uint)s.Length || !char.IsLowSurrogate(s[i + 1]))
{
// A high surrogate at the end of the string or a high surrogate
// not followed by a low surrogate
Expand All @@ -249,7 +253,6 @@ private static bool HasInvalidUnicodeSequence(ReadOnlySpan<char> s)
else
{
i++; // consume the low surrogate.
continue;
}
}
}
Expand Down
Loading