Improve code per coderabbitai review

josesimoes · josesimoes · commit e3f3beab5af1 · 2025-10-09T00:22:41.000+01:00
diff --git a/src/CLR/Core/Interpreter.cpp b/src/CLR/Core/Interpreter.cpp
@@ -2740,15 +2740,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
                     if (field.genericType && NANOCLR_INDEX_IS_VALID(*field.genericType))
                     {
                         // access static field of a generic instance
-                        CLR_RT_FieldDef_Index genericField{};
-                        genericField.data = field.data;
-
-                        // find the assembly where the generic type is instantiated
-                        CLR_RT_Assembly *typeSpecAsm =
-                            g_CLR_RT_TypeSystem.m_assemblies[field.genericType->Assembly() - 1];
-
-                        // now access the generic static field
-                        ptr = typeSpecAsm->GetGenericStaticField(*field.genericType, genericField);
+                        ptr = field.assembly->GetStaticFieldByFieldDef(field, field.genericType);
                     }
                     else
                     {
@@ -2788,15 +2780,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
                     if (field.genericType && NANOCLR_INDEX_IS_VALID(*field.genericType))
                     {
                         // access static field of a generic instance
-                        CLR_RT_FieldDef_Index genericField{};
-                        genericField.data = field.data;
-
-                        // find the assembly where the generic type is instantiated
-                        CLR_RT_Assembly *typeSpecAsm =
-                            g_CLR_RT_TypeSystem.m_assemblies[field.genericType->Assembly() - 1];
-
-                        // now access the generic static field
-                        ptr = typeSpecAsm->GetGenericStaticField(*field.genericType, genericField);
+                        ptr = field.assembly->GetStaticFieldByFieldDef(field, field.genericType);
                     }
                     else
                     {
@@ -2835,15 +2819,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
                     if (field.genericType && NANOCLR_INDEX_IS_VALID(*field.genericType))
                     {
                         // access static field of a generic instance
-                        CLR_RT_FieldDef_Index genericField{};
-                        genericField.data = field.data;
-
-                        // find the assembly where the generic type is instantiated
-                        CLR_RT_Assembly *typeSpecAsm =
-                            g_CLR_RT_TypeSystem.m_assemblies[field.genericType->Assembly() - 1];
-
-                        // now access the generic static field
-                        ptr = typeSpecAsm->GetGenericStaticField(*field.genericType, genericField);
+                        ptr = field.assembly->GetStaticFieldByFieldDef(field, field.genericType);
                     }
                     else
                     {

Original file line number	Diff line number	Diff line change
`@@ -2740,15 +2740,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)`
`2740`	`2740`	`if (field.genericType && NANOCLR_INDEX_IS_VALID(*field.genericType))`
`2741`	`2741`	`{`
`2742`	`2742`	`// access static field of a generic instance`
`2743`		`- CLR_RT_FieldDef_Index genericField{};`
`2744`		`- genericField.data = field.data;`
`2745`		`-`
`2746`		`- // find the assembly where the generic type is instantiated`
`2747`		`- CLR_RT_Assembly *typeSpecAsm =`
`2748`		`- g_CLR_RT_TypeSystem.m_assemblies[field.genericType->Assembly() - 1];`
`2749`		`-`
`2750`		`- // now access the generic static field`
`2751`		`- ptr = typeSpecAsm->GetGenericStaticField(*field.genericType, genericField);`
	`2743`	`+ ptr = field.assembly->GetStaticFieldByFieldDef(field, field.genericType);`
`2752`	`2744`	`}`
`2753`	`2745`	`else`
`2754`	`2746`	`{`
`@@ -2788,15 +2780,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)`
`2788`	`2780`	`if (field.genericType && NANOCLR_INDEX_IS_VALID(*field.genericType))`
`2789`	`2781`	`{`
`2790`	`2782`	`// access static field of a generic instance`
`2791`		`- CLR_RT_FieldDef_Index genericField{};`
`2792`		`- genericField.data = field.data;`
`2793`		`-`
`2794`		`- // find the assembly where the generic type is instantiated`
`2795`		`- CLR_RT_Assembly *typeSpecAsm =`
`2796`		`- g_CLR_RT_TypeSystem.m_assemblies[field.genericType->Assembly() - 1];`
`2797`		`-`
`2798`		`- // now access the generic static field`
`2799`		`- ptr = typeSpecAsm->GetGenericStaticField(*field.genericType, genericField);`
	`2783`	`+ ptr = field.assembly->GetStaticFieldByFieldDef(field, field.genericType);`
`2800`	`2784`	`}`
`2801`	`2785`	`else`
`2802`	`2786`	`{`
`@@ -2835,15 +2819,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)`
`2835`	`2819`	`if (field.genericType && NANOCLR_INDEX_IS_VALID(*field.genericType))`
`2836`	`2820`	`{`
`2837`	`2821`	`// access static field of a generic instance`
`2838`		`- CLR_RT_FieldDef_Index genericField{};`
`2839`		`- genericField.data = field.data;`
`2840`		`-`
`2841`		`- // find the assembly where the generic type is instantiated`
`2842`		`- CLR_RT_Assembly *typeSpecAsm =`
`2843`		`- g_CLR_RT_TypeSystem.m_assemblies[field.genericType->Assembly() - 1];`
`2844`		`-`
`2845`		`- // now access the generic static field`
`2846`		`- ptr = typeSpecAsm->GetGenericStaticField(*field.genericType, genericField);`
	`2822`	`+ ptr = field.assembly->GetStaticFieldByFieldDef(field, field.genericType);`
`2847`	`2823`	`}`
`2848`	`2824`	`else`
`2849`	`2825`	`{`