Fix ResolveToken for FieldDef when using TypeRefs

josesimoes · josesimoes · commit b6e028d11b25 · 2025-03-18T18:19:49.000Z
diff --git a/src/CLR/Core/TypeSystem.cpp b/src/CLR/Core/TypeSystem.cpp
@@ -1150,7 +1150,7 @@ bool CLR_RT_FieldDef_Instance::ResolveToken(CLR_UINT32 tk, CLR_RT_Assembly *assm
                 switch (fr->Owner())
                 {
                     case TBL_TypeRef:
-                        data = assm->crossReferenceFieldRef[fr->OwnerIndex()].target.data;
+                        data = assm->crossReferenceFieldRef[index].target.data;
                         assembly = g_CLR_RT_TypeSystem.m_assemblies[Assembly() - 1];
                         target = assembly->GetFieldDef(Field());
 

Original file line number	Diff line number	Diff line change
`@@ -1150,7 +1150,7 @@ bool CLR_RT_FieldDef_Instance::ResolveToken(CLR_UINT32 tk, CLR_RT_Assembly *assm`
`1150`	`1150`	`switch (fr->Owner())`
`1151`	`1151`	`{`
`1152`	`1152`	`case TBL_TypeRef:`
`1153`		`- data = assm->crossReferenceFieldRef[fr->OwnerIndex()].target.data;`
	`1153`	`+ data = assm->crossReferenceFieldRef[index].target.data;`
`1154`	`1154`	`assembly = g_CLR_RT_TypeSystem.m_assemblies[Assembly() - 1];`
`1155`	`1155`	`target = assembly->GetFieldDef(Field());`
`1156`	`1156`