Fix MethodBase::Invoke to handle generic instances (#3161)

josesimoes · web-flow · commit d776d5e42874 · 2025-04-29T12:29:50.000+01:00
***NO_CI***
diff --git a/src/CLR/CorLib/corlib_native_System_Reflection_MethodBase.cpp b/src/CLR/CorLib/corlib_native_System_Reflection_MethodBase.cpp
@@ -135,7 +135,10 @@ HRESULT Library_corlib_native_System_Reflection_MethodBase::Invoke___OBJECT__OBJ
     {
         if (mdR->retValDataType != DATATYPE_VOID)
         {
-            if (mdR->retValDataType < DATATYPE_I4)
+            // Types that need ChangeDataType: primitives and generic instances
+            bool needsTypeChange = (mdR->retValDataType < DATATYPE_I4 || mdR->retValDataType == DATATYPE_GENERICINST);
+
+            if (needsTypeChange)
             {
                 stack.TopValue().ChangeDataType(mdR->retValDataType);
             }

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,10 @@ HRESULT Library_corlib_native_System_Reflection_MethodBase::Invoke___OBJECT__OBJ`
`135`	`135`	`{`
`136`	`136`	`if (mdR->retValDataType != DATATYPE_VOID)`
`137`	`137`	`{`
`138`		`- if (mdR->retValDataType < DATATYPE_I4)`
	`138`	`+ // Types that need ChangeDataType: primitives and generic instances`
	`139`	`+ bool needsTypeChange = (mdR->retValDataType < DATATYPE_I4 \|\| mdR->retValDataType == DATATYPE_GENERICINST);`
	`140`	`+`
	`141`	`+ if (needsTypeChange)`
`139`	`142`	`{`
`140`	`143`	`stack.TopValue().ChangeDataType(mdR->retValDataType);`
`141`	`144`	`}`