diff --git a/src/coreclr/inc/corcompile.h b/src/coreclr/inc/corcompile.h index e4baf3423fca28..014509221a0d62 100644 --- a/src/coreclr/inc/corcompile.h +++ b/src/coreclr/inc/corcompile.h @@ -186,7 +186,6 @@ enum EncodeMethodSigFlags enum EncodeFieldSigFlags { - ENCODE_FIELD_SIG_IndexInsteadOfToken = 0x08, ENCODE_FIELD_SIG_MemberRefToken = 0x10, ENCODE_FIELD_SIG_OwnerType = 0x40, }; diff --git a/src/coreclr/inc/readytorun.h b/src/coreclr/inc/readytorun.h index 41a4aa251fa742..88219146a123a4 100644 --- a/src/coreclr/inc/readytorun.h +++ b/src/coreclr/inc/readytorun.h @@ -184,7 +184,6 @@ enum ReadyToRunMethodSigFlags enum ReadyToRunFieldSigFlags { - READYTORUN_FIELD_SIG_IndexInsteadOfToken = 0x08, READYTORUN_FIELD_SIG_MemberRefToken = 0x10, READYTORUN_FIELD_SIG_OwnerType = 0x40, }; diff --git a/src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs b/src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs index a37945534865bf..0ca8b74c85229b 100644 --- a/src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs +++ b/src/coreclr/tools/Common/Internal/Runtime/ReadyToRunConstants.cs @@ -57,7 +57,6 @@ public enum ReadyToRunMethodSigFlags : byte [Flags] public enum ReadyToRunFieldSigFlags : byte { - READYTORUN_FIELD_SIG_IndexInsteadOfToken = 0x08, READYTORUN_FIELD_SIG_MemberRefToken = 0x10, READYTORUN_FIELD_SIG_OwnerType = 0x40, } diff --git a/src/coreclr/vm/zapsig.cpp b/src/coreclr/vm/zapsig.cpp index 577acbf485a2cb..28216cb27d1b84 100644 --- a/src/coreclr/vm/zapsig.cpp +++ b/src/coreclr/vm/zapsig.cpp @@ -1024,46 +1024,32 @@ FieldDesc * ZapSig::DecodeField(Module *pReferencingModule, IfFailThrow(sig.SkipExactlyOne()); } - if (fieldFlags & ENCODE_FIELD_SIG_IndexInsteadOfToken) - { - // get the field desc using index - uint32_t fieldIndex; - IfFailThrow(sig.GetData(&fieldIndex)); - - _ASSERTE(pOwnerMT != NULL); + RID rid; + IfFailThrow(sig.GetData(&rid)); - pField = pOwnerMT->GetFieldDescByIndex(fieldIndex); - _ASSERTE(pOwnerMT == pField->GetApproxEnclosingMethodTable()); - } - else + if (fieldFlags & ENCODE_FIELD_SIG_MemberRefToken) { - RID rid; - IfFailThrow(sig.GetData(&rid)); - - if (fieldFlags & ENCODE_FIELD_SIG_MemberRefToken) + if (pOwnerMT == NULL) { - if (pOwnerMT == NULL) - { - TypeHandle th; - MethodDesc * pMD = NULL; - FieldDesc * pFD = NULL; + TypeHandle th; + MethodDesc * pMD = NULL; + FieldDesc * pFD = NULL; - MemberLoader::GetDescFromMemberRef(pInfoModule, TokenFromRid(rid, mdtMemberRef), &pMD, &pFD, NULL, FALSE, &th); - _ASSERTE(pFD != NULL); + MemberLoader::GetDescFromMemberRef(pInfoModule, TokenFromRid(rid, mdtMemberRef), &pMD, &pFD, NULL, FALSE, &th); + _ASSERTE(pFD != NULL); - pField = pFD; - } - else - { - pField = MemberLoader::GetFieldDescFromMemberRefAndType(pInfoModule, TokenFromRid(rid, mdtMemberRef), pOwnerMT); - } + pField = pFD; } else { - _ASSERTE(pInfoModule->IsFullModule()); - pField = MemberLoader::GetFieldDescFromFieldDef(static_cast(pInfoModule), TokenFromRid(rid, mdtFieldDef), FALSE); + pField = MemberLoader::GetFieldDescFromMemberRefAndType(pInfoModule, TokenFromRid(rid, mdtMemberRef), pOwnerMT); } } + else + { + _ASSERTE(pInfoModule->IsFullModule()); + pField = MemberLoader::GetFieldDescFromFieldDef(static_cast(pInfoModule), TokenFromRid(rid, mdtFieldDef), FALSE); + } if (ppTH != NULL) *ppTH = (pOwnerMT != NULL) ? pOwnerMT : pField->GetApproxEnclosingMethodTable();