Updating array validation in helper functions

Change-Id: I9dd753d27af6041f96792ad2958a5cc4f0093ca4

Author: jacob-crawley

src/tests/JIT/HardwareIntrinsics/Arm/Shared/Helpers.cs

@@ -2299,21 +2299,27 @@ public static uint AddCarryWideningEven(uint[] op1, uint[] op2, uint[] op3, int
             ulong res;
 
             if (i < 0 || i >= op1.Length || i >= op2.Length || i >= op3.Length)
+            {
                 throw new ArgumentOutOfRangeException(nameof(i), "Index i is out of range");
+            }
 
             if (i % 2 == 0)
             {
-                if (i + 1 >= op3.Length)
-                    throw new ArgumentOutOfRangeException(nameof(i), "Index i + 1 is out of range for op3.");
+                if (i + 1 >= op2.Length)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(i), "Index i + 1 is out of range.");
+                }
 
                 lsb = op2[i + 1] & 1u;
                 res = (ulong)op1[i] + op3[i] + lsb;
                 return (uint)res;
             }
             else
             {
-                if (i - 1 < 0)
+                if (i - 1 < 0 || i - 1 >= op1.Length || i - 1 >= op3.Length)
+                {
                     throw new ArgumentOutOfRangeException(nameof(i), "Index i - 1 is out of range.");
+                }
 
                 lsb = op2[i] & 1u;
                 res = (ulong)op1[i - 1] + op3[i - 1] + lsb;
@@ -2329,21 +2335,27 @@ public static uint AddCarryWideningOdd(uint[] op1, uint[] op2, uint[] op3, int i
             ulong res;
 
             if (i < 0 || i >= op1.Length || i >= op2.Length || i >= op3.Length)
+            {
                 throw new ArgumentOutOfRangeException(nameof(i), "Index i is out of range");
+            }
 
             if (i % 2 == 0)
             {
-                if (i + 1 >= op3.Length)
-                    throw new ArgumentOutOfRangeException(nameof(i), "Index i + 1 is out of range for op3.");
+                if (i + 1 >= op1.Length || i + 1 >= op2.Length)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(i), "Index i + 1 is out of range.");
+                }
 
                 lsb = op2[i + 1] & 1u;
-                res = (ulong)op1[i + 1] + op3[i] +  lsb;
+                res = (ulong)op1[i + 1] + op3[i] + lsb;
                 return (uint)res;
             }
             else
             {
-                if (i - 1 < 0)
+                if (i - 1 < 0 || i - 1 >= op3.Length)
+                {
                     throw new ArgumentOutOfRangeException(nameof(i), "Index i - 1 is out of range.");
+                }
 
                 lsb = op2[i] & 1u;
                 res = (ulong)op1[i] + op3[i - 1] + lsb;
@@ -2482,21 +2494,27 @@ public static ulong AddCarryWideningEven(ulong[] op1, ulong[] op2, ulong[] op3,
             ulong res;
 
             if (i < 0 || i >= op1.Length || i >= op2.Length || i >= op3.Length)
+            {
                 throw new ArgumentOutOfRangeException(nameof(i), "Index i is out of range");
+            }
 
             if (i % 2 == 0)
             {
-                if (i + 1 >= op3.Length)
+                if (i + 1 >= op2.Length)
+                {
                     throw new ArgumentOutOfRangeException(nameof(i), "Index i + 1 is out of range for op3.");
+                }
 
                 lsb = op2[i + 1] & 1UL;
                 res = op1[i] + op3[i] + lsb;
                 return res;
             }
             else
             {
-                if (i - 1 < 0)
+                if (i - 1 < 0 || i - 1 >= op1.Length || i - 1 >= op3.Length)
+                {
                     throw new ArgumentOutOfRangeException(nameof(i), "Index i - 1 is out of range.");
+                }
 
                 lsb = op2[i] & 1UL;
 
@@ -2517,21 +2535,27 @@ public static ulong AddCarryWideningOdd(ulong[] op1, ulong[] op2, ulong[] op3, i
             ulong res;
 
             if (i < 0 || i >= op1.Length || i >= op2.Length || i >= op3.Length)
+            {
                 throw new ArgumentOutOfRangeException(nameof(i), "Index i is out of range");
+            }
 
             if (i % 2 == 0)
             {
-                if (i + 1 >= op3.Length)
-                    throw new ArgumentOutOfRangeException(nameof(i), "Index i + 1 is out of range for op3.");
+                if (i + 1 >= op1.Length || i + 1 >= op2.Length)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(i), "Index i + 1 is out of range.");
+                }
 
                 lsb = op2[i + 1] & 1UL;
                 res = op1[i + 1] + op3[i] + lsb;
                 return res;
             }
             else
             {
-                if (i - 1 < 0)
+                if (i - 1 < 0 || i - 1 >= op3.Length)
+                {
                     throw new ArgumentOutOfRangeException(nameof(i), "Index i - 1 is out of range.");
+                }
 
                 lsb = op2[i] & 1UL;