Revert "GetCorElementTypeOfElementType"

This reverts commit b59fa9d.
dotnet · Jun 2, 2024 · b610b35 · b610b35
1 parent 7ffe745
commit b610b35
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Array.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Array.CoreCLR.cs
@@ -617,8 +617,13 @@ public unsafe int GetLowerBound(int dimension)
             return Unsafe.Add(ref RuntimeHelpers.GetMultiDimensionalArrayBounds(this), rank + dimension);
         }
 
-        [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern CorElementType GetCorElementTypeOfElementType();
+        internal unsafe CorElementType GetCorElementTypeOfElementType()
+        {
+            MethodTable* pMT = RuntimeHelpers.GetMethodTable(this);
+            CorElementType et = pMT->GetArrayElementTypeHandle().GetVerifierCorElementType();
+            GC.KeepAlive(this);
+            return et;
+        }
 
         private unsafe bool IsValueOfElementType(object value)
         {

diff --git a/src/coreclr/classlibnative/bcltype/arraynative.cpp b/src/coreclr/classlibnative/bcltype/arraynative.cpp
@@ -17,17 +17,6 @@
 
 #include "arraynative.inl"
 
-// Returns a bool to indicate if the array is of primitive types or not.
-FCIMPL1(INT32, ArrayNative::GetCorElementTypeOfElementType, ArrayBase* arrayUNSAFE)
-{
-    FCALL_CONTRACT;
-
-    _ASSERTE(arrayUNSAFE != NULL);
-
-    return arrayUNSAFE->GetArrayElementTypeHandle().GetVerifierCorElementType();
-}
-FCIMPLEND
-
 extern "C" PCODE QCALLTYPE Array_GetElementConstructorEntrypoint(QCall::TypeHandle pArrayTypeHnd)
 {
     QCALL_CONTRACT;

diff --git a/src/coreclr/classlibnative/bcltype/arraynative.h b/src/coreclr/classlibnative/bcltype/arraynative.h
@@ -25,7 +25,6 @@ struct FCALLRuntimeFieldHandle
 class ArrayNative
 {
 public:
-    static FCDECL1(INT32, GetCorElementTypeOfElementType, ArrayBase* arrayUNSAFE);
 
     static FCDECL2(FC_BOOL_RET, IsSimpleCopy, ArrayBase* pSrc, ArrayBase* pDst);
 

diff --git a/src/coreclr/vm/ecalllist.h b/src/coreclr/vm/ecalllist.h
@@ -360,7 +360,6 @@ FCFuncStart(gCastHelpers)
 FCFuncEnd()
 
 FCFuncStart(gArrayFuncs)
-    FCFuncElement("GetCorElementTypeOfElementType", ArrayNative::GetCorElementTypeOfElementType)
     FCFuncElement("IsSimpleCopy", ArrayNative::IsSimpleCopy)
     FCFuncElement("InternalSetValue", ArrayNative::SetValue)
 FCFuncEnd()
@@ -537,7 +536,6 @@ FCFuncEnd()
 // Note these have to remain sorted by name:namespace pair (Assert will wack you if you don't)
 // The sorting is case-sensitive
 
-FCClassElement("Array", "System", gArrayFuncs)
 FCClassElement("AssemblyLoadContext", "System.Runtime.Loader", gAssemblyLoadContextFuncs)
 FCClassElement("Buffer", "System", gBufferFuncs)
 FCClassElement("CastHelpers", "System.Runtime.CompilerServices", gCastHelpers)
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,6 @@ struct FCALLRuntimeFieldHandle @@
     class ArrayNative
     {
     public:
-        static FCDECL1(INT32, GetCorElementTypeOfElementType, ArrayBase* arrayUNSAFE);
         static FCDECL2(FC_BOOL_RET, IsSimpleCopy, ArrayBase* pSrc, ArrayBase* pDst);
@@ Expand Down @@