Merge pull request #20 from rameel/simplify-bounds-check

Simplify bounds checks in ArrayView<T> and StringView Slice methods

Author: rameel

Ramstack.Structures/Collections/ArrayView`1.cs

@@ -81,16 +81,11 @@ public ArrayView(T[] array, int index)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public ArrayView(T[] array, int index, int length)
     {
-        if (IntPtr.Size == 8)
-        {
-            if ((ulong)(uint)index + (uint)length > (uint)array.Length)
-                ThrowHelper.ThrowArgumentOutOfRangeException();
-        }
-        else
-        {
-            if ((uint)index > (uint)array.Length || (uint)length > (uint)(array.Length - index))
-                ThrowHelper.ThrowArgumentOutOfRangeException();
-        }
+        //
+        // https://github.com/dotnet/runtime/issues/119689
+        //
+        if ((uint)index > (uint)array.Length || (uint)length > (uint)(array.Length - index))
+            ThrowHelper.ThrowArgumentOutOfRangeException();
 
         _index = index;
         _count = length;
@@ -152,16 +147,8 @@ public ArrayView<T> Slice(int index)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public ArrayView<T> Slice(int index, int count)
     {
-        if (IntPtr.Size == 8)
-        {
-            if ((ulong)(uint)index + (uint)count > (uint)_count)
-                ThrowHelper.ThrowArgumentOutOfRangeException();
-        }
-        else
-        {
-            if ((uint)index > (uint)_count || (uint)count > (uint)(_count - index))
-                ThrowHelper.ThrowArgumentOutOfRangeException();
-        }
+        if ((uint)index > (uint)_count || (uint)count > (uint)(_count - index))
+            ThrowHelper.ThrowArgumentOutOfRangeException();
 
         return new ArrayView<T>(_array!, _index + index, count, unused: 0);
     }

Ramstack.Structures/Text/StringView.cs

@@ -76,16 +76,8 @@ public StringView(string value, int index)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public StringView(string value, int index, int length)
     {
-        if (IntPtr.Size == 8)
-        {
-            if ((ulong)(uint)index + (uint)length > (uint)value.Length)
-                ThrowHelper.ThrowArgumentOutOfRangeException();
-        }
-        else
-        {
-            if ((uint)index > (uint)value.Length || (uint)length > (uint)(value.Length - index))
-                ThrowHelper.ThrowArgumentOutOfRangeException();
-        }
+        if ((uint)index > (uint)value.Length || (uint)length > (uint)(value.Length - index))
+            ThrowHelper.ThrowArgumentOutOfRangeException();
 
         _index = index;
         _length = length;
@@ -177,16 +169,8 @@ public StringView Slice(int start)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public StringView Slice(int start, int length)
     {
-        if (IntPtr.Size == 8)
-        {
-            if ((ulong)(uint)start + (uint)length > (uint)_length)
-                ThrowHelper.ThrowArgumentOutOfRangeException();
-        }
-        else
-        {
-            if ((uint)start > (uint)_length || (uint)length > (uint)(_length - start))
-                ThrowHelper.ThrowArgumentOutOfRangeException();
-        }
+        if ((uint)start > (uint)_length || (uint)length > (uint)(_length - start))
+            ThrowHelper.ThrowArgumentOutOfRangeException();
 
         return new StringView(_value!, _index + start, length, unused: 0);
     }