Fix FieldDesc::GetExactFieldType when FieldDesc doesn't exactly represent the owner type (#10941)

* Fix FieldDesc::GetExactFieldType when FieldDesc doesn't exactly represent the owner type

To get the exact type from FieldDesc, field signature should point past the calling convention.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/vm/field.cpp b/src/vm/field.cpp
index 9cdb16f6b9..667e2ac867 100644
--- a/src/vm/field.cpp
+++ b/src/vm/field.cpp
@@ -888,12 +888,15 @@ TypeHandle FieldDesc::GetExactFieldType(TypeHandle owner)
         GetSig(&pSig, &cSig);
         SigPointer sig(pSig, cSig);
 
+        ULONG callConv;
+        IfFailThrow(sig.GetCallingConv(&callConv));
+        _ASSERTE(callConv == IMAGE_CEE_CS_CALLCONV_FIELD);
+
         // Get the generics information
         SigTypeContext sigTypeContext(GetExactClassInstantiation(owner), Instantiation());
 
-        TypeHandle thApproxFieldType = GetApproxFieldTypeHandleThrowing();
         // Load the exact type
-        RETURN (sig.GetTypeHandleThrowing(thApproxFieldType.GetModule(), &sigTypeContext));
+        RETURN (sig.GetTypeHandleThrowing(GetModule(), &sigTypeContext));
     }
 }