Cleanup some code and comments leftover from BlockCopy refactor (dotnet/coreclr#27432)

* Remove orphaned FCall GetRawArrayData.

* Update some comments relating to arrays.

Commit migrated from https://github.com/dotnet/coreclr/commit/797dbc65d8fa30a95523f0e355538d9b7dcd8a32

diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.cs b/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.cs
index acd1b51..02b2934 100644 (file)
--- a/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.cs
+++ b/src/coreclr/src/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.cs
@@ -171,6 +171,15 @@ namespace System.Runtime.CompilerServices
         internal static ref byte GetRawSzArrayData(this Array array) =>
             ref Unsafe.As<RawArrayData>(array).Data;
 
+        // CLR arrays are laid out in memory as follows (multidimensional array bounds are optional):
+        // [ sync block || pMethodTable || num components || MD array bounds || array data .. ]
+        //                 ^               ^                                    ^ returned reference
+        //                 |               \-- ref Unsafe.As<RawData>(array).Data
+        //                 \-- array
+        // The BaseSize of an array includes all the fields before the array data,
+        // including the sync block and method table. The reference to RawData.Data
+        // points at the number of components, skipping over these two pointer-sized fields.
+        // So substrate those from BaseSize before adding to the RawData.Data reference.
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal static unsafe ref byte GetRawArrayData(this Array array) =>
             ref Unsafe.AddByteOffset(ref Unsafe.As<RawData>(array).Data, (nuint)GetObjectMethodTablePointer(array)->BaseSize - (nuint)(2 * sizeof(IntPtr)));
@@ -186,16 +195,9 @@ namespace System.Runtime.CompilerServices
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal static unsafe bool ObjectHasComponentSize(object obj)
         {
-            // CLR objects are laid out in memory as follows.
-            // [ pMethodTable || .. object data .. ]
-            //   ^-- the object reference points here
-            //
-            // The m_dwFlags field of the method table class will have its high bit set if the
+            // The Flags field of the method table class will have its high bit set if the
             // method table has component size info stored somewhere. See member
             // MethodTable:IsStringOrArray in src\vm\methodtable.h for full details.
-            //
-            // So in effect this method is the equivalent of
-            // return ((MethodTable*)(*obj))->IsStringOrArray();
             return (int)GetObjectMethodTablePointer(obj)->Flags < 0;
         }
 
@@ -211,7 +213,7 @@ namespace System.Runtime.CompilerServices
             public uint BaseSize;
         }
 
-        // Given an object reference, returns its MethodTable* as an IntPtr.
+        // Given an object reference, returns its MethodTable*.
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static unsafe MethodTable* GetObjectMethodTablePointer(object obj)
         {

diff --git a/src/coreclr/src/classlibnative/bcltype/arraynative.cpp b/src/coreclr/src/classlibnative/bcltype/arraynative.cpp
index 6d8bb80..3f64dbc 100644 (file)
--- a/src/coreclr/src/classlibnative/bcltype/arraynative.cpp
+++ b/src/coreclr/src/classlibnative/bcltype/arraynative.cpp
@@ -101,19 +101,6 @@ FCIMPL2(INT32, ArrayNative::GetLength, ArrayBase* array, unsigned int dimension)
 FCIMPLEND
 
 
-FCIMPL1(void*, ArrayNative::GetRawArrayData, ArrayBase* array)
-{
-    FCALL_CONTRACT;
-
-    VALIDATEOBJECT(array);
-
-    _ASSERTE(array != NULL);
-
-    return array->GetDataPtr();
-}
-FCIMPLEND
-
-
 // array is GC protected by caller
 void ArrayInitializeWorker(ARRAYBASEREF * arrayRef,
                            MethodTable* pArrayMT,

diff --git a/src/coreclr/src/classlibnative/bcltype/arraynative.h b/src/coreclr/src/classlibnative/bcltype/arraynative.h
index a8716d9..b3135cb 100644 (file)
--- a/src/coreclr/src/classlibnative/bcltype/arraynative.h
+++ b/src/coreclr/src/classlibnative/bcltype/arraynative.h
@@ -26,7 +26,6 @@ class ArrayNative
 {
 public:
     static FCDECL1(INT32, GetRank, ArrayBase* pArray);
-    static FCDECL1(void*, GetRawArrayData, ArrayBase* array);
     static FCDECL2(INT32, GetLowerBound, ArrayBase* pArray, unsigned int dimension);
     static FCDECL2(INT32, GetUpperBound, ArrayBase* pArray, unsigned int dimension);
     static FCDECL2(INT32, GetLength, ArrayBase* pArray, unsigned int dimension);

diff --git a/src/coreclr/src/vm/array.cpp b/src/coreclr/src/vm/array.cpp
index ac4e76b..194d346 100644 (file)
--- a/src/coreclr/src/vm/array.cpp
+++ b/src/coreclr/src/vm/array.cpp
@@ -255,7 +255,7 @@ MethodTable* Module::CreateArrayMethodTable(TypeHandle elemTypeHnd, CorElementTy
     // used when verfifying generic code.
     // However verification is tied in with some codegen in the JITs, so give these
     // the shared MT just in case.
-    // This checks match precisely one in ParamTypeDesc::OwnsMethodTable
+    // This checks match precisely one in ParamTypeDesc::OwnsTemplateMethodTable
     if (CorTypeInfo::IsGenericVariable(elemType)) {
         // This is loading the canonical version of the array so we can override
         OVERRIDE_TYPE_LOAD_LEVEL_LIMIT(CLASS_LOADED);

diff --git a/src/coreclr/src/vm/ecalllist.h b/src/coreclr/src/vm/ecalllist.h
index 215ed58..11dd8d8 100644 (file)
--- a/src/coreclr/src/vm/ecalllist.h
+++ b/src/coreclr/src/vm/ecalllist.h
@@ -724,7 +724,6 @@ FCFuncStart(gArrayFuncs)
     FCFuncElement("GetLowerBound", ArrayNative::GetLowerBound)
     FCFuncElement("GetUpperBound", ArrayNative::GetUpperBound)
     FCIntrinsicSig("GetLength", &gsig_IM_Int_RetInt, ArrayNative::GetLength, CORINFO_INTRINSIC_Array_GetDimLength)
-    FCFuncElement("GetRawArrayData", ArrayNative::GetRawArrayData)
     FCFuncElement("Initialize", ArrayNative::Initialize)
     FCFuncElement("Copy", ArrayNative::ArrayCopy)
     FCFuncElement("GetRawArrayGeometry", ArrayNative::GetRawArrayGeometry)

diff --git a/src/coreclr/src/vm/object.h b/src/coreclr/src/vm/object.h
index 93c6d65..952630e 100644 (file)
--- a/src/coreclr/src/vm/object.h
+++ b/src/coreclr/src/vm/object.h
@@ -573,7 +573,6 @@ private:
     SVAL_DECL(INT32, s_arrayBoundsZero); // = 0
 
     // What comes after this conceputally is:
-    // TypeHandle elementType;        Only present if the method table is shared among many types (arrays of pointers)
     // INT32      bounds[rank];       The bounds are only present for Multidimensional arrays   
     // INT32      lowerBounds[rank];  Valid indexes are lowerBounds[i] <= index[i] < lowerBounds[i] + bounds[i]
 

diff --git a/src/coreclr/src/vm/typedesc.h b/src/coreclr/src/vm/typedesc.h
index c3e4829..83ef610 100644 (file)
--- a/src/coreclr/src/vm/typedesc.h
+++ b/src/coreclr/src/vm/typedesc.h
@@ -354,9 +354,6 @@ public:
         INDEBUG(Verify());
     }
 
-//private:    TypeHandle      m_Arg;              // The type that is being modified
-
-
     // placement new operator
     void* operator new(size_t size, void* spot) {   return (spot); }