address PR comments (dotnet#5011)

tonerdo · Feb 12, 2019 · 9517413 · 9517413
1 parent 74f24c9
commit 9517413
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/src/System.Private.CoreLib/src/Internal/Runtime/Augments/RuntimeAugments.cs b/src/System.Private.CoreLib/src/Internal/Runtime/Augments/RuntimeAugments.cs
@@ -164,13 +164,11 @@ public static unsafe Array NewMultiDimArray(RuntimeTypeHandle typeHandleForArray
             return Array.NewMultiDimArray(typeHandleForArrayType.ToEETypePtr(), pLengths, lengths.Length);
         }
 
-        public static void StelemRef(Array array, int index, object obj)
-        {
-            TypeCast.StelemRef(array, index, obj);
-        }
-
         public static ref byte GetSzArrayElementAddress(Array array, int index)
         {
+            if ((uint)index >= (uint)array.Length)
+                throw new IndexOutOfRangeException();
+
             ref byte start = ref array.GetRawSzArrayData();
             return ref Unsafe.Add(ref start, (IntPtr)((nuint)index * array.ElementSize));
         }

diff --git a/src/System.Private.Interpreter/src/Internal/Runtime/Interpreter/ILInterpreter.cs b/src/System.Private.Interpreter/src/Internal/Runtime/Interpreter/ILInterpreter.cs
@@ -2168,7 +2168,8 @@ private void InterpretStoreElement(ILOpcode opcode)
                 case StackValueKind.NativeInt:
                     {
                         long value = (long)indexItem.AsNativeInt();
-                        Debug.Assert(value >= int.MinValue && value <= int.MaxValue);
+                        if (value >= int.MinValue && value <= int.MaxValue)
+                            throw new IndexOutOfRangeException();
                         index = (int)value;
                     }
                     break;
@@ -2177,9 +2178,6 @@ private void InterpretStoreElement(ILOpcode opcode)
                     break;
             }
 
-            if (index < 0 || index >= array.Length)
-                throw new IndexOutOfRangeException();
-
             ref byte address = ref RuntimeAugments.GetSzArrayElementAddress(array, index);
 
             switch (opcode)
@@ -2206,7 +2204,7 @@ private void InterpretStoreElement(ILOpcode opcode)
                     Unsafe.Write(ref address, valueItem.AsDouble());
                     break;
                 case ILOpcode.stelem_ref:
-                    RuntimeAugments.StelemRef(array, index, valueItem.AsObjectRef());
+                    Unsafe.As<Object[]>(array)[index] = valueItem.AsObjectRef();
                     break;
                 default:
                     Debug.Assert(false);
@@ -2230,7 +2228,8 @@ private void InterpretStoreElement(int token)
                 case StackValueKind.NativeInt:
                     {
                         long value = (long)indexItem.AsNativeInt();
-                        Debug.Assert(value >= int.MinValue && value <= int.MaxValue);
+                        if (value >= int.MinValue && value <= int.MaxValue)
+                            throw new IndexOutOfRangeException();
                         index = (int)value;
                     }
                     break;
@@ -2239,9 +2238,6 @@ private void InterpretStoreElement(int token)
                     break;
             }
 
-            if (index < 0 || index >= array.Length)
-                throw new IndexOutOfRangeException();
-
             TypeDesc elementType = (TypeDesc)_methodIL.GetObject(token);
             ref byte address = ref RuntimeAugments.GetSzArrayElementAddress(array, index);
 
@@ -2291,7 +2287,7 @@ private void InterpretStoreElement(int token)
                 case TypeFlags.Interface:
                 case TypeFlags.Array:
                 case TypeFlags.SzArray:
-                    RuntimeAugments.StelemRef(array, index, valueItem.AsObjectRef());
+                    Unsafe.As<Object[]>(array)[index] = valueItem.AsObjectRef();
                     break;
                 default:
                     // TODO: Support more complex return types
@@ -2313,7 +2309,8 @@ private void InterpretLoadElement(ILOpcode opcode)
                 case StackValueKind.NativeInt:
                     {
                         long value = (long)indexItem.AsNativeInt();
-                        Debug.Assert(value >= int.MinValue && value <= int.MaxValue);
+                        if (value >= int.MinValue && value <= int.MaxValue)
+                            throw new IndexOutOfRangeException();
                         index = (int)value;
                     }
                     break;
@@ -2322,9 +2319,6 @@ private void InterpretLoadElement(ILOpcode opcode)
                     break;
             }
 
-            if (index < 0 || index >= array.Length)
-                throw new IndexOutOfRangeException();
-
             ref byte address = ref RuntimeAugments.GetSzArrayElementAddress(array, index);
 
             switch (opcode)
@@ -2382,7 +2376,8 @@ private void InterpretLoadElement(int token)
                 case StackValueKind.NativeInt:
                     {
                         long value = (long)indexItem.AsNativeInt();
-                        Debug.Assert(value >= int.MinValue && value <= int.MaxValue);
+                        if (value >= int.MinValue && value <= int.MaxValue)
+                            throw new IndexOutOfRangeException();
                         index = (int)value;
                     }
                     break;
@@ -2391,9 +2386,6 @@ private void InterpretLoadElement(int token)
                     break;
             }
 
-            if (index < 0 || index >= array.Length)
-                throw new IndexOutOfRangeException();
-
             TypeDesc elementType = (TypeDesc)_methodIL.GetObject(token);
             ref byte address = ref RuntimeAugments.GetSzArrayElementAddress(array, index);