Merge pull request #12168 from gbalykov/remove-relocations-readonly

Partially remove relocations from SECTION_Readonly

1 files changed, 2 insertions, 16 deletions

diff --git a/src/vm/method.cpp b/src/vm/method.cpp
index 63777e8ac1..4bae82a61d 100644
--- a/src/vm/method.cpp
+++ b/src/vm/method.cpp
@@ -3341,14 +3341,7 @@ MethodDesc::Fixup(
             }
         }
 
-        if (decltype(InstantiatedMethodDesc::m_pPerInstInfo)::isRelative)
-        {
-            image->FixupRelativePointerField(this, offsetof(InstantiatedMethodDesc, m_pPerInstInfo));
-        }
-        else
-        {
-            image->FixupPointerField(this, offsetof(InstantiatedMethodDesc, m_pPerInstInfo));
-        }
+        image->FixupPlainOrRelativePointerField((InstantiatedMethodDesc*) this, &InstantiatedMethodDesc::m_pPerInstInfo);
 
         // Generic methods are dealt with specially to avoid encoding the formal method type parameters
         if (IsTypicalMethodDefinition())
@@ -3427,14 +3420,7 @@ MethodDesc::Fixup(
 
         NDirectMethodDesc *pNMD = (NDirectMethodDesc *)this;
 
-        if (decltype(NDirectMethodDesc::ndirect.m_pWriteableData)::isRelative)
-        {
-            image->FixupRelativePointerField(this, offsetof(NDirectMethodDesc, ndirect.m_pWriteableData));
-        }
-        else
-        {
-            image->FixupPointerField(this, offsetof(NDirectMethodDesc, ndirect.m_pWriteableData));
-        }
+        image->FixupPlainOrRelativePointerField(pNMD, &NDirectMethodDesc::ndirect, &decltype(NDirectMethodDesc::ndirect)::m_pWriteableData);
 
         NDirectWriteableData *pWriteableData = pNMD->GetWriteableData();
         NDirectImportThunkGlue *pImportThunkGlue = pNMD->GetNDirectImportThunkGlue();