From de586767f51432e5d89f6fcffee07c488fdeeb7b Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Mon, 4 Jun 2018 10:08:22 -0700 Subject: Work in VM towards cross-bitness crossgen (#18245) * Replace sizeof expressions with target-specific constants: * sizeof(ObjHeader) -> OBJHEADER_SIZE * sizeof(Object) -> OBJECT_SIZE * ObjSizeOf(Object) -> OBJECT_BASESIZE * sizeof(ArrayBase) -> ARRAYBASE_SIZE * ObjSizeOf(ArrayBase) -> ARRAYBASE_BASESIZE * Remove ObjSizeOf macro * Use OBJECT_SIZE in ArrayBase::GetBoundsOffset * Cast ppObj to CORCOMPILE_GCREFMAP_TOKENS* before dereferencing in FakePromote * LOG2_PTRSIZE should depend on _TARGET_64BIT_ --- src/vm/ceemain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/vm/ceemain.cpp') diff --git a/src/vm/ceemain.cpp b/src/vm/ceemain.cpp index b8c0adc363..f599a2aa23 100644 --- a/src/vm/ceemain.cpp +++ b/src/vm/ceemain.cpp @@ -2456,7 +2456,7 @@ void InitializeGarbageCollector() // in the object, there is no gc descriptor, and thus no need to adjust // the pointer to skip the gc descriptor. - g_pFreeObjectMethodTable->SetBaseSize(ObjSizeOf (ArrayBase)); + g_pFreeObjectMethodTable->SetBaseSize(ARRAYBASE_BASESIZE); g_pFreeObjectMethodTable->SetComponentSize(1); hr = GCHeapUtilities::LoadAndInitialize(); -- cgit v1.2.3