Remove ArrayClass::m_ElementType - get type from the type handle on MethodTable

src/coreclr/vm/array.cpp

@@ -337,7 +337,6 @@ MethodTable* Module::CreateArrayMethodTable(TypeHandle elemTypeHnd, CorElementTy
  pClass->SetInternalCorElementType(arrayKind);
  pClass->SetAttrClass (tdPublic | tdSerializable | tdSealed); // This class is public, serializable, sealed
  pClass->SetRank (Rank);
- pClass->SetArrayElementType (elemType);
  pClass->SetMethodTable (pMT);
 
  // Fill In the method table
@@ -658,9 +657,8 @@ class ArrayOpLinker : public ILStubLinker
  hiddenArgIdx = 0;
  }
 #endif
-
- ArrayClass *pcls = (ArrayClass*)(pMT->GetClass());
- if(pcls->GetArrayElementType() == ELEMENT_TYPE_CLASS)
+ CorElementType sigElementType = pMT->GetArrayElementType();
+ if (CorTypeInfo::IsObjRef(sigElementType))
  {
  // Type Check
  if(m_pMD->GetArrayFuncIndex() == ArrayMethodDesc::ARRAY_FUNC_SET)

src/coreclr/vm/class.h

@@ -1953,7 +1953,6 @@ class ArrayClass : public EEClass
 
  DAC_ALIGNAS(EEClass) // Align the first member to the alignment of the base class
  unsigned char m_rank;
- CorElementType m_ElementType;// Cache of element type in m_ElementTypeHnd
 
 public:
  DWORD GetRank() {
@@ -1969,16 +1968,6 @@ class ArrayClass : public EEClass
  m_rank = (unsigned char)Rank;
  }
 
- CorElementType GetArrayElementType() {
- LIMITED_METHOD_CONTRACT;
- return m_ElementType;
- }
- void SetArrayElementType(CorElementType ElementType) {
- LIMITED_METHOD_CONTRACT;
- m_ElementType = ElementType;
- }
-
-
  // Allocate a new MethodDesc for the methods we add to this class
  void InitArrayMethodDesc(
  ArrayMethodDesc* pNewMD,

src/coreclr/vm/gchelpers.cpp

@@ -402,7 +402,7 @@ OBJECTREF AllocateSzArray(MethodTable* pArrayMT, INT32 cElements, GC_ALLOC_FLAGS
 #endif
 
 #ifdef FEATURE_DOUBLE_ALIGNMENT_HINT
- if ((pArrayMT->GetArrayElementType() == ELEMENT_TYPE_R8) &&
+ if ((pArrayMT->GetArrayElementTypeHandle() == CoreLibBinder::GetElementType(ELEMENT_TYPE_R8)) &&
  ((DWORD)cElements >= g_pConfig->GetDoubleArrayToLargeObjectHeapThreshold()))
  {
  STRESS_LOG2(LF_GC, LL_INFO10, "Allocating double MD array of size %d and length %d to large object heap\n", totalSize, cElements);
@@ -425,7 +425,7 @@ OBJECTREF AllocateSzArray(MethodTable* pArrayMT, INT32 cElements, GC_ALLOC_FLAGS
  else
  {
 #ifdef FEATURE_DOUBLE_ALIGNMENT_HINT
- if (pArrayMT->GetArrayElementType() == ELEMENT_TYPE_R8)
+ if (pArrayMT->GetArrayElementTypeHandle() == CoreLibBinder::GetElementType(ELEMENT_TYPE_R8))
  {
  flags |= GC_ALLOC_ALIGN8;
  }
@@ -497,7 +497,7 @@ OBJECTREF TryAllocateFrozenSzArray(MethodTable* pArrayMT, INT32 cElements)
 
  // FrozenObjectHeapManager doesn't yet support objects with a custom alignment,
  // so we give up on arrays of value types requiring 8 byte alignment on 32bit platforms.
- if ((DATA_ALIGNMENT < sizeof(double)) && (pArrayMT->GetArrayElementType() == ELEMENT_TYPE_R8))
+ if ((DATA_ALIGNMENT < sizeof(double)) && (pArrayMT->GetArrayElementTypeHandle() == CoreLibBinder::GetElementType(ELEMENT_TYPE_R8)))
  {
  return NULL;
  }
@@ -665,7 +665,7 @@ OBJECTREF AllocateArrayEx(MethodTable *pArrayMT, INT32 *pArgs, DWORD dwNumArgs,
 #endif
 
 #ifdef FEATURE_DOUBLE_ALIGNMENT_HINT
- if ((pArrayMT->GetArrayElementType() == ELEMENT_TYPE_R8) &&
+ if ((pArrayMT->GetArrayElementTypeHandle() == CoreLibBinder::GetElementType(ELEMENT_TYPE_R8)) &&
  (cElements >= g_pConfig->GetDoubleArrayToLargeObjectHeapThreshold()))
  {
  STRESS_LOG2(LF_GC, LL_INFO10, "Allocating double MD array of size %d and length %d to large object heap\n", totalSize, cElements);

src/coreclr/vm/methodtable.h

@@ -2783,7 +2783,11 @@ class MethodTable
  }
 
  // The following methods are only valid for the method tables for array types.
- CorElementType GetArrayElementType();
+ CorElementType GetArrayElementType()
+ {
+ return GetArrayElementTypeHandle().GetSignatureCorElementType();
+ }
+
  DWORD GetRank();
 
  TypeHandle GetArrayElementTypeHandle()

src/coreclr/vm/methodtable.inl

@@ -299,15 +299,6 @@ inline BOOL MethodTable::IsValueType()
  return GetFlag(enum_flag_Category_ValueType_Mask) == enum_flag_Category_ValueType;
 }
 
-//==========================================================================================
-inline CorElementType MethodTable::GetArrayElementType()
-{
- WRAPPER_NO_CONTRACT;
-
- _ASSERTE (IsArray());
- return dac_cast<PTR_ArrayClass>(GetClass())->GetArrayElementType();
-}
-
 //==========================================================================================
 inline DWORD MethodTable::GetRank()
 {

src/tests/baseservices/invalid_operations/Arrays.cs

@@ -0,0 +1,50 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Reflection;
+
+using Xunit;
+
+public class Arrays
+{
+ private class TestClass { }
+
+ [Fact]
+ public static void TypeMismatch_ArrayElement()
+ {
+ Console.WriteLine($"Running {nameof(TypeMismatch_ArrayElement)}...");
+ TestClass[][] arr = new TestClass[1][];
+ MethodInfo arraySet = typeof(object[][]).GetMethod("Set");
+ Exception e = Assert.Throws<TargetInvocationException>(() => arraySet.Invoke(arr, [0, new object[] { new object() }]));
+ Assert.IsType<ArrayTypeMismatchException>(e.InnerException);
+ }
+
+ [Fact]
+ public static void TypeMismatch_MultidimensionalArrayElement()
+ {
+ Console.WriteLine($"Running {nameof(TypeMismatch_MultidimensionalArrayElement)}...");
+ TestClass[][,] arr = new TestClass[1][,];
+ MethodInfo arraySet = typeof(object[][,]).GetMethod("Set");
+ Exception e = Assert.Throws<TargetInvocationException>(() => arraySet.Invoke(arr, [0, new object[1,1] { {new object()} }]));
+ Assert.IsType<ArrayTypeMismatchException>(e.InnerException);
+ }
+
+ [Fact]
+ public static void TypeMismatch_ClassElement()
+ {
+ Console.WriteLine($"Running {nameof(TypeMismatch_ClassElement)}...");
+ {
+ TestClass[] arr = new TestClass[1];
+ MethodInfo arraySet = typeof(object[]).GetMethod("Set");
+ Exception e = Assert.Throws<TargetInvocationException>(() => arraySet.Invoke(arr, [0, new object()]));
+ Assert.IsType<ArrayTypeMismatchException>(e.InnerException);
+ }
+ {
+ TestClass[,] arr = new TestClass[1,1];
+ MethodInfo arraySet = typeof(object[,]).GetMethod("Set");
+ Exception e = Assert.Throws<TargetInvocationException>(() => arraySet.Invoke(arr, [0, 0, new object()]));
+ Assert.IsType<ArrayTypeMismatchException>(e.InnerException);
+ }
+ }
+}

src/tests/baseservices/invalid_operations/InvalidOperations.csproj

@@ -8,6 +8,7 @@
  </PropertyGroup>
  <ItemGroup>
  <Compile Include="ManagedPointers.cs" />
+ <Compile Include="Arrays.cs" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />