Improve size computation for array objects

josesimoes · josesimoes · commit 641c61137e0b · 2025-06-05T09:24:39.000+01:00
diff --git a/src/CLR/Core/Interpreter.cpp b/src/CLR/Core/Interpreter.cpp
@@ -3153,6 +3153,14 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
                     {
                         size = c_CLR_RT_DataTypeLookup[elemDT].m_sizeInBytes;
                     }
+                    else if (
+                        (expectedType.target->flags & CLR_RECORD_TYPEDEF::TD_Semantics_Mask) ==
+                        CLR_RECORD_TYPEDEF::TD_Semantics_ValueType)
+                    {
+                        size =
+                            (CLR_RT_HeapBlock::HB_Object_Fields_Offset + +expectedType.CrossReference().totalFields) *
+                            sizeof(CLR_RT_HeapBlock);
+                    }
 
                     // Store the value into the actual array buffer
                     NANOCLR_CHECK_HRESULT(evalPos[3].StoreToReference(evalPos[1], size));

Original file line number	Diff line number	Diff line change
`@@ -3153,6 +3153,14 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)`
`3153`	`3153`	`{`
`3154`	`3154`	`size = c_CLR_RT_DataTypeLookup[elemDT].m_sizeInBytes;`
`3155`	`3155`	`}`
	`3156`	`+ else if (`
	`3157`	`+ (expectedType.target->flags & CLR_RECORD_TYPEDEF::TD_Semantics_Mask) ==`
	`3158`	`+ CLR_RECORD_TYPEDEF::TD_Semantics_ValueType)`
	`3159`	`+ {`
	`3160`	`+ size =`
	`3161`	`+ (CLR_RT_HeapBlock::HB_Object_Fields_Offset + +expectedType.CrossReference().totalFields) *`
	`3162`	`+ sizeof(CLR_RT_HeapBlock);`
	`3163`	`+ }`
`3156`	`3164`
`3157`	`3165`	`// Store the value into the actual array buffer`
`3158`	`3166`	`NANOCLR_CHECK_HRESULT(evalPos[3].StoreToReference(evalPos[1], size));`