diff options
| author | Gleb Balykov <g.balykov@samsung.com> | 2017-06-23 15:48:48 +0300 |
|---|---|---|
| committer | Gleb Balykov <g.balykov@samsung.com> | 2017-07-10 16:37:05 +0300 |
| commit | c4c04ea45cda3194cdf2189d757b96602ea344ee (patch) | |
| tree | e04539919b2ce293ec81397ab5715ea8455d69b9 /src/vm/generics.cpp | |
| parent | cf1fb9e17fc8b6ee849edab5a696d0ec5c6eadd2 (diff) | |
| download | coreclr-c4c04ea45cda3194cdf2189d757b96602ea344ee.tar.gz coreclr-c4c04ea45cda3194cdf2189d757b96602ea344ee.tar.bz2 coreclr-c4c04ea45cda3194cdf2189d757b96602ea344ee.zip | |
Remove relocations for MethodTable's vtable-1st-level-indirection
Diffstat (limited to 'src/vm/generics.cpp')
| -rw-r--r-- | src/vm/generics.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm/generics.cpp b/src/vm/generics.cpp index 1a182da718..ed5313263f 100644 --- a/src/vm/generics.cpp +++ b/src/vm/generics.cpp @@ -255,7 +255,7 @@ ClassLoader::CreateTypeHandleForNonCanonicalGenericInstantiation( // Bytes are required for the vtable itself S_SIZE_T safe_cbMT = S_SIZE_T( cbGC ) + S_SIZE_T( sizeof(MethodTable) ); - safe_cbMT += MethodTable::GetNumVtableIndirections(cSlots) * sizeof(PTR_PCODE); + safe_cbMT += MethodTable::GetNumVtableIndirections(cSlots) * sizeof(MethodTable::VTableIndir_t); if (safe_cbMT.IsOverflow()) { ThrowHR(COR_E_OVERFLOW); @@ -440,7 +440,7 @@ ClassLoader::CreateTypeHandleForNonCanonicalGenericInstantiation( if (canShareVtableChunks) { // Share the canonical chunk - it.SetIndirectionSlot(pOldMT->GetVtableIndirections()[it.GetIndex()]); + it.SetIndirectionSlot(pOldMT->GetVtableIndirections()[it.GetIndex()].GetValueMaybeNull()); } else { |