Collect all MethodDesc fields in one place (#101565)

* Collect all MethodDesc fields in one place

* Change enum name.

* Remove irrelevant macro - METHOD_MAX_RVA.

Author: AaronRobinsonMSFT

src/coreclr/vm/amd64/asmconstants.h

@@ -278,9 +278,6 @@ ASMCONSTANTS_C_ASSERT(OFFSETOF__LazyMachState__m_CaptureRip
 ASMCONSTANTS_C_ASSERT(OFFSETOF__LazyMachState__m_CaptureRsp
                     == offsetof(LazyMachState, m_CaptureRsp));
 
-#define               OFFSETOF__MethodDesc__m_wFlags        DBG_FRE(0x2E, 0x06)
-ASMCONSTANTS_C_ASSERT(OFFSETOF__MethodDesc__m_wFlags == offsetof(MethodDesc, m_wFlags));
-
 #define               OFFSETOF__VASigCookie__pNDirectILStub     0x8
 ASMCONSTANTS_C_ASSERT(OFFSETOF__VASigCookie__pNDirectILStub
                     == offsetof(VASigCookie, pNDirectILStub));

src/coreclr/vm/arm/asmconstants.h

@@ -114,13 +114,6 @@ ASMCONSTANTS_C_ASSERT(SIZEOF__FloatArgumentRegisters == sizeof(FloatArgumentRegi
 #define ASM_ENREGISTERED_RETURNTYPE_MAXSIZE 0x20
 ASMCONSTANTS_C_ASSERT(ASM_ENREGISTERED_RETURNTYPE_MAXSIZE == ENREGISTERED_RETURNTYPE_MAXSIZE)
 
-
-#define MethodDesc__m_wFlags DBG_FRE(0x1A, 0x06)
-ASMCONSTANTS_C_ASSERT(MethodDesc__m_wFlags == offsetof(MethodDesc, m_wFlags))
-
-#define MethodDesc__mdcClassification 0x7
-ASMCONSTANTS_C_ASSERT(MethodDesc__mdcClassification == mdcClassification)
-
 #ifdef FEATURE_COMINTEROP
 
 #define Stub__m_pCode DBG_FRE(0x10, 0x0c)

src/coreclr/vm/classcompat.cpp

@@ -869,7 +869,7 @@ VOID MethodTableBuilder::BuildInteropVTable_PlaceMembers(
         bmtMethod->ppMethodDescList[i] = pNewMD;
 
         // Make sure that fcalls have a 0 rva.  This is assumed by the prejit fixup logic
-        _ASSERTE(((Classification & ~mdcMethodImpl) != mcFCall) || dwDescrOffset == 0);
+        _ASSERTE(((Classification & ~mdfMethodImpl) != mcFCall) || dwDescrOffset == 0);
 
         // Non-virtual method
         if (IsMdStatic(dwMemberAttrs) ||
@@ -938,7 +938,7 @@ VOID MethodTableBuilder::BuildInteropVTable_PlaceMembers(
             }
         }
 
-        if (Classification & mdcMethodImpl)
+        if (Classification & mdfMethodImpl)
         {   // If this method serves as the BODY of a MethodImpl specification, then
         // we should iterate all the MethodImpl's for this class and see just how many
         // of them this method participates in as the BODY.
@@ -2797,7 +2797,7 @@ VOID    MethodTableBuilder::EnumerateClassMethods()
         }
 
         // Generic methods should always be mcInstantiated
-        if (!((numGenericMethodArgs == 0) || ((Classification & mdcClassification) == mcInstantiated)))
+        if (!((numGenericMethodArgs == 0) || ((Classification & mdfClassification) == mcInstantiated)))
         {
             BuildMethodTableThrowException(BFA_GENERIC_METHODS_INST);
         }
@@ -2806,7 +2806,7 @@ VOID    MethodTableBuilder::EnumerateClassMethods()
         // from the overrides.
         for(DWORD impls = 0; impls < bmtMethodImpl->dwNumberMethodImpls; impls++) {
             if ((bmtMethodImpl->rgMethodImplTokens[impls].methodBody == tok) && !IsMdStatic(dwMemberAttrs)) {
-                Classification |= mdcMethodImpl;
+                Classification |= mdfMethodImpl;
                 break;
             }
         }
@@ -2830,7 +2830,7 @@ VOID    MethodTableBuilder::EnumerateClassMethods()
 
         // Set the index into the storage locations
         BYTE impl;
-        if (Classification & mdcMethodImpl)
+        if (Classification & mdfMethodImpl)
         {
             impl = METHOD_IMPL;
         }
@@ -2840,25 +2840,25 @@ VOID    MethodTableBuilder::EnumerateClassMethods()
         }
 
         BYTE type;
-        if ((Classification & mdcClassification)  == mcNDirect)
+        if ((Classification & mdfClassification)  == mcNDirect)
         {
             type = METHOD_TYPE_NDIRECT;
         }
-        else if ((Classification & mdcClassification) == mcFCall)
+        else if ((Classification & mdfClassification) == mcFCall)
         {
             type = METHOD_TYPE_FCALL;
         }
-        else if ((Classification & mdcClassification) == mcEEImpl)
+        else if ((Classification & mdfClassification) == mcEEImpl)
         {
             type = METHOD_TYPE_EEIMPL;
         }
 #ifdef FEATURE_COMINTEROP
-        else if ((Classification & mdcClassification) == mcComInterop)
+        else if ((Classification & mdfClassification) == mcComInterop)
         {
             type = METHOD_TYPE_INTEROP;
         }
 #endif // FEATURE_COMINTEROP
-        else if ((Classification & mdcClassification) == mcInstantiated)
+        else if ((Classification & mdfClassification) == mcInstantiated)
         {
             type = METHOD_TYPE_INSTANTIATED;
         }

src/coreclr/vm/i386/asmconstants.h

@@ -233,13 +233,6 @@ ASMCONSTANTS_C_ASSERT(OFFSETOF__FrameHandlerExRecord__m_pEntryFrame == offsetof(
 
 #endif
 
-
-#define MethodDesc_m_wFlags                   DBG_FRE(0x1a, 0x06)
-ASMCONSTANTS_C_ASSERT(MethodDesc_m_wFlags == offsetof(MethodDesc, m_wFlags))
-
-#define MethodDesc_mdcClassification          7
-ASMCONSTANTS_C_ASSERT(MethodDesc_mdcClassification == mdcClassification)
-
 #define ComPlusCallMethodDesc__m_pComPlusCallInfo DBG_FRE(0x1C, 0x8)
 ASMCONSTANTS_C_ASSERT(ComPlusCallMethodDesc__m_pComPlusCallInfo == offsetof(ComPlusCallMethodDesc, m_pComPlusCallInfo))
 

src/coreclr/vm/method.cpp

@@ -120,10 +120,10 @@ SIZE_T MethodDesc::SizeOf()
     LIMITED_METHOD_DAC_CONTRACT;
 
     SIZE_T size = s_ClassificationSizeTable[m_wFlags &
-        (mdcClassification
-        | mdcHasNonVtableSlot
-        | mdcMethodImpl
-        | mdcHasNativeCodeSlot)];
+        (mdfClassification
+        | mdfHasNonVtableSlot
+        | mdfMethodImpl
+        | mdfHasNativeCodeSlot)];
 
     return size;
 }
@@ -946,7 +946,7 @@ PTR_PCODE MethodDesc::GetAddrOfNativeCodeSlot()
 
     _ASSERTE(HasNativeCodeSlot());
 
-    SIZE_T size = s_ClassificationSizeTable[m_wFlags & (mdcClassification | mdcHasNonVtableSlot |  mdcMethodImpl)];
+    SIZE_T size = s_ClassificationSizeTable[m_wFlags & (mdfClassification | mdfHasNonVtableSlot |  mdfMethodImpl)];
 
     return (PTR_PCODE)(dac_cast<TADDR>(this) + size);
 }
@@ -2252,7 +2252,7 @@ MethodImpl *MethodDesc::GetMethodImpl()
     }
     CONTRACTL_END
 
-    SIZE_T size = s_ClassificationSizeTable[m_wFlags & (mdcClassification | mdcHasNonVtableSlot)];
+    SIZE_T size = s_ClassificationSizeTable[m_wFlags & (mdfClassification | mdfHasNonVtableSlot)];
 
     return PTR_MethodImpl(dac_cast<TADDR>(this) + size);
 }