Skip to content

Fix SearchValues asserts for WASM #118030

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 1 commit into from
Jul 25, 2025
Merged

Fix SearchValues asserts for WASM #118030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/SearchValues/AsciiByteSearchValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ internal sealed class AsciiByteSearchValues<TUniqueLowNibble> : SearchValues<byt

public AsciiByteSearchValues(ReadOnlySpan<byte> values)
{
// Despite the name being Ascii, this type may be used with non-ASCII values on ARM.
// See IndexOfAnyAsciiSearcher.CanUseUniqueLowNibbleSearch.
Debug.Assert(Ascii.IsValid(values) || (AdvSimd.IsSupported && TUniqueLowNibble.Value));
// Despite the name being Ascii, this type may be used with non-ASCII values on ARM or WASM.
// See comments in IndexOfAnyAsciiSearcher.CanUseUniqueLowNibbleSearch.
Debug.Assert(Ascii.IsValid(values) || (TUniqueLowNibble.Value && (AdvSimd.IsSupported || PackedSimd.IsSupported)));

if (TUniqueLowNibble.Value)
{
Expand Down
7 changes: 4 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/SearchValues/AsciiCharSearchValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ internal sealed class AsciiCharSearchValues<TOptimizations, TUniqueLowNibble> :

public AsciiCharSearchValues(ReadOnlySpan<char> values)
{
// Despite the name being Ascii, this type may be used with non-ASCII values on ARM.
// See IndexOfAnyAsciiSearcher.CanUseUniqueLowNibbleSearch.
Debug.Assert(Ascii.IsValid(values) || (AdvSimd.IsSupported && TUniqueLowNibble.Value));
// Despite the name being Ascii, this type may be used with non-ASCII values on ARM or WASM.
// See comments in IndexOfAnyAsciiSearcher.CanUseUniqueLowNibbleSearch.
Debug.Assert(Ascii.IsValid(values) || (TUniqueLowNibble.Value && (AdvSimd.IsSupported || PackedSimd.IsSupported)));
Debug.Assert(!values.ContainsAnyInRange((char)byte.MaxValue, char.MaxValue));

if (TUniqueLowNibble.Value)
{
Expand Down
Loading