Fix array type descriptor comparison for arrays

josesimoes · josesimoes · commit b92bf088ee8e · 2025-06-05T18:23:21.000+01:00
***NO_CI***
diff --git a/src/CLR/Core/CLR_RT_HeapBlock.cpp b/src/CLR/Core/CLR_RT_HeapBlock.cpp
@@ -896,7 +896,10 @@ bool CLR_RT_HeapBlock::TypeDescriptorsMatch(
         case DATATYPE_SZARRAY:
         {
             // compare outer dims (always 1) then element types
-            return TypeDescriptorsMatch(expectedType, actualType);
+            CLR_RT_TypeDescriptor expectedElementType, actualElementType;
+            expectedElementType.GetElementType(expectedElementType);
+            actualElementType.GetElementType(actualElementType);
+            return TypeDescriptorsMatch(expectedElementType, actualElementType);
         }
 
         // primitives and other leaf types match on the DataType alone

Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,10 @@ bool CLR_RT_HeapBlock::TypeDescriptorsMatch(`
`896`	`896`	`case DATATYPE_SZARRAY:`
`897`	`897`	`{`
`898`	`898`	`// compare outer dims (always 1) then element types`
`899`		`- return TypeDescriptorsMatch(expectedType, actualType);`
	`899`	`+ CLR_RT_TypeDescriptor expectedElementType, actualElementType;`
	`900`	`+ expectedElementType.GetElementType(expectedElementType);`
	`901`	`+ actualElementType.GetElementType(actualElementType);`
	`902`	`+ return TypeDescriptorsMatch(expectedElementType, actualElementType);`
`900`	`903`	`}`
`901`	`904`
`902`	`905`	`// primitives and other leaf types match on the DataType alone`