Address some code nits (#90289)

dotnet · Aug 10, 2023 · 3be8fa1 · 3be8fa1
1 parent 2b9e556
commit 3be8fa1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 71 deletions.
diff --git a/src/coreclr/vm/classcompat.cpp b/src/coreclr/vm/classcompat.cpp
@@ -3128,8 +3128,15 @@ HRESULT MethodTableBuilder::LoaderFindMethodInClass(
 
         // Note instantiation info
         {
-            hr = MetaSig::CompareMethodSigsNT(*ppMemberSignature, *pcMemberSignature, pModule, NULL,
-                                                      pHashMethodSig, cHashMethodSig, entryDesc->GetModule(), pSubst);
+            hr = E_FAIL;
+            EX_TRY
+            {
+                hr = MetaSig::CompareMethodSigs(*ppMemberSignature, *pcMemberSignature, pModule, NULL,
+                                        pHashMethodSig, cHashMethodSig, entryDesc->GetModule(), pSubst, FALSE)
+                        ? S_OK
+                        : S_FALSE;
+            }
+            EX_CATCH_HRESULT_NO_ERRORINFO(hr);
 
             if (hr == S_OK)
             {   // Found a match

diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp
@@ -1663,24 +1663,6 @@ void CEEInfo::getFieldInfo (CORINFO_RESOLVED_TOKEN * pResolvedToken,
     }
     else
     {
-        BOOL fInstanceHelper = FALSE;
-
-        if (fInstanceHelper)
-        {
-            if (flags & CORINFO_ACCESS_ADDRESS)
-            {
-                fieldAccessor = CORINFO_FIELD_INSTANCE_ADDR_HELPER;
-
-                pResult->helper = CORINFO_HELP_GETFIELDADDR;
-            }
-            else
-            {
-                fieldAccessor = CORINFO_FIELD_INSTANCE_HELPER;
-
-                pResult->helper = getInstanceFieldHelper(pField, flags);
-            }
-        }
-        else
         if (pField->IsEnCNew())
         {
             fieldAccessor = CORINFO_FIELD_INSTANCE_ADDR_HELPER;

diff --git a/src/coreclr/vm/siginfo.cpp b/src/coreclr/vm/siginfo.cpp
@@ -130,9 +130,9 @@ DEFINEELEMENTTYPEINFO(ELEMENT_TYPE_INTERNAL,       -1,                   TYPE_GC
 
 unsigned GetSizeForCorElementType(CorElementType etyp)
 {
-        LIMITED_METHOD_DAC_CONTRACT;
-        _ASSERTE(gElementTypeInfo[etyp].m_elementType == etyp);
-        return gElementTypeInfo[etyp].m_cbSize;
+    LIMITED_METHOD_DAC_CONTRACT;
+    _ASSERTE(gElementTypeInfo[etyp].m_elementType == etyp);
+    return gElementTypeInfo[etyp].m_cbSize;
 }
 
 #ifndef DACCESS_COMPILE
@@ -2603,7 +2603,7 @@ UINT MetaSig::GetElemSize(CorElementType etype, TypeHandle thValueType)
     if ((UINT)etype >= ARRAY_SIZE(gElementTypeInfo))
         ThrowHR(COR_E_BADIMAGEFORMAT, BFA_BAD_COMPLUS_SIG);
 
-    int cbsize = gElementTypeInfo[(UINT)etype].m_cbSize;
+    int cbsize = GetSizeForCorElementType(etype);
     if (cbsize != -1)
         return(cbsize);
 
@@ -4310,35 +4310,6 @@ MetaSig::CompareMethodSigs(
     return TRUE;
 }
 
-//---------------------------------------------------------------------------------------
-//
-//static
-HRESULT
-MetaSig::CompareMethodSigsNT(
-    PCCOR_SIGNATURE      pSignature1,
-    DWORD                cSig1,
-    Module *             pModule1,
-    const Substitution * pSubst1,
-    PCCOR_SIGNATURE      pSignature2,
-    DWORD                cSig2,
-    Module *             pModule2,
-    const Substitution * pSubst2,
-    TokenPairList *      pVisited) //= NULL
-{
-    STATIC_CONTRACT_NOTHROW;
-
-    HRESULT hr = S_OK;
-    EX_TRY
-    {
-        if (CompareMethodSigs(pSignature1, cSig1, pModule1, pSubst1, pSignature2, cSig2, pModule2, pSubst2, FALSE, pVisited))
-            hr = S_OK;
-        else
-            hr = S_FALSE;
-    }
-    EX_CATCH_HRESULT_NO_ERRORINFO(hr);
-    return hr;
-}
-
 //---------------------------------------------------------------------------------------
 //
 // Compare two method sigs and return whether they are the same.

diff --git a/src/coreclr/vm/siginfo.hpp b/src/coreclr/vm/siginfo.hpp
@@ -1009,24 +1009,6 @@ class MetaSig
             TokenPairList*      pVisited = NULL
         );
 
-        // Nonthrowing version of CompareMethodSigs
-        //
-        //   Return S_OK if they match
-        //          S_FALSE if they don't match
-        //          FAILED  if OOM or some other blocking error
-        //
-        static HRESULT CompareMethodSigsNT(
-            PCCOR_SIGNATURE pSig1,
-            DWORD       cSig1,
-            Module*     pModule1,
-            const Substitution* pSubst1,
-            PCCOR_SIGNATURE pSig2,
-            DWORD       cSig2,
-            Module*     pModule2,
-            const Substitution* pSubst2,
-            TokenPairList *pVisited = NULL
-        );
-
         static BOOL CompareFieldSigs(
             PCCOR_SIGNATURE pSig1,
             DWORD       cSig1,