diff options
| author | gbalykov <g.balykov@samsung.com> | 2017-06-03 06:31:28 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-06-02 20:31:28 -0700 |
| commit | fd3668c7c9b9f5d64b5e6d1edf8c55a307cd3c2d (patch) | |
| tree | 4dfd969b9979a2e4794e0cff4c46a378343b993e /src/vm/genmeth.cpp | |
| parent | b47b138d595267315008885e6ac7e2f4322cc5a9 (diff) | |
| download | coreclr-fd3668c7c9b9f5d64b5e6d1edf8c55a307cd3c2d.tar.gz coreclr-fd3668c7c9b9f5d64b5e6d1edf8c55a307cd3c2d.tar.bz2 coreclr-fd3668c7c9b9f5d64b5e6d1edf8c55a307cd3c2d.zip | |
Remove relocations from SECTION_MethodDesc for ngened images for fields accessed from jit code for Linux ARM (#11963)
Diffstat (limited to 'src/vm/genmeth.cpp')
| -rw-r--r-- | src/vm/genmeth.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vm/genmeth.cpp b/src/vm/genmeth.cpp index d5b435bb42..dc55221308 100644 --- a/src/vm/genmeth.cpp +++ b/src/vm/genmeth.cpp @@ -1518,9 +1518,9 @@ void InstantiatedMethodDesc::SetupGenericMethodDefinition(IMDInternalImport *pIM S_SIZE_T dwAllocSize = S_SIZE_T(numTyPars) * S_SIZE_T(sizeof(TypeHandle)); // the memory allocated for m_pMethInst will be freed if the declaring type fails to load - m_pPerInstInfo = (Dictionary *) pamTracker->Track(pAllocator->GetLowFrequencyHeap()->AllocMem(dwAllocSize)); + m_pPerInstInfo.SetValue((Dictionary *) pamTracker->Track(pAllocator->GetLowFrequencyHeap()->AllocMem(dwAllocSize))); - TypeHandle * pInstDest = (TypeHandle *)m_pPerInstInfo; + TypeHandle * pInstDest = (TypeHandle *) IMD_GetMethodDictionaryNonNull(); for(unsigned int i = 0; i < numTyPars; i++) { hEnumTyPars.EnumNext(&tkTyPar); @@ -1553,7 +1553,7 @@ void InstantiatedMethodDesc::SetupWrapperStubWithInstantiations(MethodDesc* wrap m_pWrappedMethodDesc.SetValue(wrappedMD); m_wFlags2 = WrapperStubWithInstantiations | (m_wFlags2 & ~KindMask); - m_pPerInstInfo = (Dictionary*)pInst; + m_pPerInstInfo.SetValueMaybeNull((Dictionary*)pInst); _ASSERTE(FitsIn<WORD>(numGenericArgs)); m_wNumGenericArgs = static_cast<WORD>(numGenericArgs); @@ -1571,7 +1571,7 @@ void InstantiatedMethodDesc::SetupSharedMethodInstantiation(DWORD numGenericArgs _ASSERTE(numGenericArgs != 0); // Initially the dictionary layout is empty m_wFlags2 = SharedMethodInstantiation | (m_wFlags2 & ~KindMask); - m_pPerInstInfo = (Dictionary *)pPerInstInfo; + m_pPerInstInfo.SetValueMaybeNull((Dictionary *)pPerInstInfo); _ASSERTE(FitsIn<WORD>(numGenericArgs)); m_wNumGenericArgs = static_cast<WORD>(numGenericArgs); @@ -1589,7 +1589,7 @@ void InstantiatedMethodDesc::SetupUnsharedMethodInstantiation(DWORD numGenericAr // The first field is never used m_wFlags2 = UnsharedMethodInstantiation | (m_wFlags2 & ~KindMask); - m_pPerInstInfo = (Dictionary *)pInst; + m_pPerInstInfo.SetValueMaybeNull((Dictionary *)pInst); _ASSERTE(FitsIn<WORD>(numGenericArgs)); m_wNumGenericArgs = static_cast<WORD>(numGenericArgs); |