diff options
author | Jan Kotas <jkotas@microsoft.com> | 2018-01-13 00:40:45 -0800 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2018-01-13 00:40:45 -0800 |
commit | 2b197262e52b06719db5179cc42b55851874c88c (patch) | |
tree | 599b45f80968cd88b2e3e83835e2fb0555324784 /src/vm/jithelpers.cpp | |
parent | 3126bd31077a6d97f665a573957d5bb6419f9a0f (diff) | |
download | coreclr-2b197262e52b06719db5179cc42b55851874c88c.tar.gz coreclr-2b197262e52b06719db5179cc42b55851874c88c.tar.bz2 coreclr-2b197262e52b06719db5179cc42b55851874c88c.zip |
Revert "Remove relocations for MethodTable::m_pParentMethodTable for Linux ARM"
This reverts commit cf1fb9e17fc8b6ee849edab5a696d0ec5c6eadd2.
Diffstat (limited to 'src/vm/jithelpers.cpp')
-rw-r--r-- | src/vm/jithelpers.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vm/jithelpers.cpp b/src/vm/jithelpers.cpp index 12f110c8e9..9f887e6616 100644 --- a/src/vm/jithelpers.cpp +++ b/src/vm/jithelpers.cpp @@ -2396,7 +2396,7 @@ HCIMPL2(Object*, JIT_ChkCastClass_Portable, MethodTable* pTargetMT, Object* pObj if (pMT == pTargetMT) return pObject; - pMT = MethodTable::GetParentMethodTable(pMT); + pMT = MethodTable::GetParentMethodTableOrIndirection(pMT); } while (pMT); ENDFORBIDGC(); @@ -2416,14 +2416,14 @@ HCIMPL2(Object*, JIT_ChkCastClassSpecial_Portable, MethodTable* pTargetMT, Objec PRECONDITION(pObject->GetMethodTable() != pTargetMT); } CONTRACTL_END; - PTR_VOID pMT = MethodTable::GetParentMethodTable(pObject->GetMethodTable()); + PTR_VOID pMT = MethodTable::GetParentMethodTableOrIndirection(pObject->GetMethodTable()); while (pMT) { if (pMT == pTargetMT) return pObject; - pMT = MethodTable::GetParentMethodTable(pMT); + pMT = MethodTable::GetParentMethodTableOrIndirection(pMT); } ENDFORBIDGC(); @@ -2450,7 +2450,7 @@ HCIMPL2(Object*, JIT_IsInstanceOfClass_Portable, MethodTable* pTargetMT, Object* if (pMT == pTargetMT) return pObject; - pMT = MethodTable::GetParentMethodTable(pMT); + pMT = MethodTable::GetParentMethodTableOrIndirection(pMT); } while (pMT); if (!pObject->GetMethodTable()->HasTypeEquivalence()) |