Remove ArrayClass::m_ElementType - get type from the type handle on M…

…ethodTable
dotnet · Aug 22, 2024 · 84be45b · 84be45b
1 parent 631778a
commit 84be45b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 25 deletions.
diff --git a/src/coreclr/vm/array.cpp b/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(sigElementType == ELEMENT_TYPE_CLASS || sigElementType == ELEMENT_TYPE_ARRAY)
         {
             // Type Check
             if(m_pMD->GetArrayFuncIndex() == ArrayMethodDesc::ARRAY_FUNC_SET)

diff --git a/src/coreclr/vm/class.h b/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,

diff --git a/src/coreclr/vm/methodtable.h b/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()

diff --git a/src/coreclr/vm/methodtable.inl b/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()
 {