diff options
| -rw-r--r-- | src/vm/arm64/stubs.cpp | 2 | ||||
| -rw-r--r-- | src/vm/object.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/vm/arm64/stubs.cpp b/src/vm/arm64/stubs.cpp index 83b2a21ec3..b5dee2e23c 100644 --- a/src/vm/arm64/stubs.cpp +++ b/src/vm/arm64/stubs.cpp @@ -1084,7 +1084,6 @@ void JIT_TailCall() #if !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) void InitJITHelpers1() { -#ifdef FEATURE_PAL // TODO STANDARD_VM_CONTRACT; _ASSERTE(g_SystemInfo.dwNumberOfProcessors != 0); @@ -1107,7 +1106,6 @@ void InitJITHelpers1() ECall::DynamicallyAssignFCallImpl(GetEEFuncEntryPoint(AllocateString_MP_FastPortable), ECall::FastAllocateString); } } -#endif JIT_UpdateWriteBarrierState(GCHeapUtilities::IsServerHeap()); } diff --git a/src/vm/object.cpp b/src/vm/object.cpp index e008486de0..fb1294d5f5 100644 --- a/src/vm/object.cpp +++ b/src/vm/object.cpp @@ -779,6 +779,8 @@ void ArrayBase::AssertArrayTypeDescLoaded() { _ASSERTE (m_pMethTab->IsArray()); + ENABLE_FORBID_GC_LOADER_USE_IN_THIS_SCOPE(); + // The type should already be loaded // See also: MethodTable::DoFullyLoad TypeHandle th = ClassLoader::LoadArrayTypeThrowing(m_pMethTab->GetApproxArrayElementTypeHandle(), |