Generate rank information in BulkType events

src/coreclr/nativeaot/Runtime/MethodTable.cpp

@@ -9,6 +9,7 @@
 #include "MethodTable.h"
 #include "PalLimitedContext.h"
 #include "Pal.h"
+#include "ObjectLayout.h"
 
 #include "CommonMacros.inl"
 #include "MethodTable.inl"
@@ -105,3 +106,17 @@ MethodTable * MethodTable::GetRelatedParameterType()
 
 	return PTR_EEType(reinterpret_cast<TADDR>(m_RelatedType.m_pRelatedParameterType));
 }
+
+//-----------------------------------------------------------------------------------------------------------
+uint32_t MethodTable::GetArrayRank()
+{
+    ASSERT(IsArray());
+    uint32_t boundsSize = GetParameterizedTypeShape() - SZARRAY_BASE_SIZE;
+    if (boundsSize > 0)
+    {
+        // Multidim array case: Base size includes space for two Int32s
+        // (upper and lower bound) per each dimension of the array.
+        return boundsSize / (2 * sizeof(uint32_t));
+    }
+    return 1;
+}

src/coreclr/nativeaot/Runtime/eventtrace_bulktype.cpp

@@ -295,12 +295,33 @@ int BulkTypeEventLogger::LogSingleType(MethodTable * pEEType)
 
     if (pEEType->IsParameterizedType())
     {
-        ASSERT(pEEType->IsArray());
-        // Array
-        pVal->fixedSizedData.Flags |= kEtwTypeFlagsArray;
+        if (pEEType->IsArray())
+        {
+            pVal->fixedSizedData.Flags |= kEtwTypeFlagsArray;
+
+            if (!pEEType->IsSzArray())
+            {
+                // Multidimensional arrays set the rank bits, SzArrays do not set the rank bits
+                uint32_t rank = pEEType->GetArrayRank();
+                if (rank < kEtwTypeFlagsArrayRankMax)
+                {
+                    // Only ranks less than kEtwTypeFlagsArrayRankMax are supported.
+                    // Fortunately kEtwTypeFlagsArrayRankMax should be greater than the
+                    // number of ranks the type loader will support
+                    rank <<= kEtwTypeFlagsArrayRankShift;
+                    ASSERT((rank & kEtwTypeFlagsArrayRankMask) == rank);
+                    pVal->fixedSizedData.Flags |= rank;
+                }
+            }
+        }
+
         pVal->cTypeParameters = 1;
         pVal->ullSingleTypeParameter = (ULONGLONG) pEEType->GetRelatedParameterType();
     }
+    else if (pEEType->IsFunctionPointer())
+    {
+        // No extra logging for function pointers
+    }
     else
     {
         // Note: For generic types, we do not necessarily know the generic parameters.

src/coreclr/nativeaot/Runtime/eventtracebase.h

@@ -42,7 +42,17 @@ enum EtwTypeFlags
     kEtwTypeFlagsFinalizable =                      0x2,
     kEtwTypeFlagsExternallyImplementedCOMObject =   0x4,
     kEtwTypeFlagsArray =                            0x8,
-    kEtwTypeFlagsModuleBaseAddress =                0x10,
+    kEtwTypeFlagsModuleBaseAddress =               0x10,
+    kEtwTypeFlagsArrayRankBit0 =                  0x100,
+    kEtwTypeFlagsArrayRankBit1 =                  0x200,
+    kEtwTypeFlagsArrayRankBit2 =                  0x400,
+    kEtwTypeFlagsArrayRankBit3 =                  0x800,
+    kEtwTypeFlagsArrayRankBit4 =                 0x1000,
+    kEtwTypeFlagsArrayRankBit5 =                 0x2000,
+
+    kEtwTypeFlagsArrayRankMask =                 0x3F00,
+    kEtwTypeFlagsArrayRankShift =                     8,
+    kEtwTypeFlagsArrayRankMax = kEtwTypeFlagsArrayRankMask >> kEtwTypeFlagsArrayRankShift
 };
 
 enum EtwThreadFlags

src/coreclr/nativeaot/Runtime/inc/MethodTable.h

@@ -197,6 +197,12 @@ class MethodTable
         return m_uBaseSize & ~FunctionPointerFlagsMask;
     }
 
+    uint32_t GetParameterizedTypeShape()
+    {
+        ASSERT(IsParameterizedType());
+        return m_uBaseSize;
+    }
+
     Kinds GetKind();
 
     bool IsArray()
@@ -208,6 +214,8 @@ class MethodTable
     bool IsSzArray()
         { return GetElementType() == ElementType_SzArray; }
 
+    uint32_t GetArrayRank();
+
     bool IsParameterizedType()
         { return (GetKind() == ParameterizedEEType); }