Fix SearchValues asserts for WASM (#118030)

MihaZupan · web-flow · commit 988fde50337f · 2025-07-25T01:05:34.000Z
diff --git a/src/libraries/System.Private.CoreLib/src/System/SearchValues/AsciiByteSearchValues.cs b/src/libraries/System.Private.CoreLib/src/System/SearchValues/AsciiByteSearchValues.cs
@@ -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)
             {
diff --git a/src/libraries/System.Private.CoreLib/src/System/SearchValues/AsciiCharSearchValues.cs b/src/libraries/System.Private.CoreLib/src/System/SearchValues/AsciiCharSearchValues.cs
@@ -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)
             {

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ internal sealed class AsciiByteSearchValues<TUniqueLowNibble> : SearchValues<byt`
`18`	`18`
`19`	`19`	`public AsciiByteSearchValues(ReadOnlySpan<byte> values)`
`20`	`20`	`{`
`21`		`- // Despite the name being Ascii, this type may be used with non-ASCII values on ARM.`
`22`		`- // See IndexOfAnyAsciiSearcher.CanUseUniqueLowNibbleSearch.`
`23`		`- Debug.Assert(Ascii.IsValid(values) \|\| (AdvSimd.IsSupported && TUniqueLowNibble.Value));`
	`21`	`+ // Despite the name being Ascii, this type may be used with non-ASCII values on ARM or WASM.`
	`22`	`+ // See comments in IndexOfAnyAsciiSearcher.CanUseUniqueLowNibbleSearch.`
	`23`	`+ Debug.Assert(Ascii.IsValid(values) \|\| (TUniqueLowNibble.Value && (AdvSimd.IsSupported \|\| PackedSimd.IsSupported)));`
`24`	`24`
`25`	`25`	`if (TUniqueLowNibble.Value)`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,10 @@ internal sealed class AsciiCharSearchValues<TOptimizations, TUniqueLowNibble> :`
`19`	`19`
`20`	`20`	`public AsciiCharSearchValues(ReadOnlySpan<char> values)`
`21`	`21`	`{`
`22`		`- // Despite the name being Ascii, this type may be used with non-ASCII values on ARM.`
`23`		`- // See IndexOfAnyAsciiSearcher.CanUseUniqueLowNibbleSearch.`
`24`		`- Debug.Assert(Ascii.IsValid(values) \|\| (AdvSimd.IsSupported && TUniqueLowNibble.Value));`
	`22`	`+ // Despite the name being Ascii, this type may be used with non-ASCII values on ARM or WASM.`
	`23`	`+ // See comments in IndexOfAnyAsciiSearcher.CanUseUniqueLowNibbleSearch.`
	`24`	`+ Debug.Assert(Ascii.IsValid(values) \|\| (TUniqueLowNibble.Value && (AdvSimd.IsSupported \|\| PackedSimd.IsSupported)));`
	`25`	`+ Debug.Assert(!values.ContainsAnyInRange((char)byte.MaxValue, char.MaxValue));`
`25`	`26`
`26`	`27`	`if (TUniqueLowNibble.Value)`
`27`	`28`	`{`