From 170854b92017d709bc82d7631c6cb33dd7443078 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Sun, 20 Jan 2019 08:16:44 -0800 Subject: Cleanup array related FCalls (#22097) * Cleanup Array FCalls * Disable outdated CoreFX tests https://github.com/dotnet/corefx/pull/34700 --- src/vm/ecalllist.h | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) (limited to 'src/vm/ecalllist.h') diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h index 89ed6fa95e..5fce2000eb 100644 --- a/src/vm/ecalllist.h +++ b/src/vm/ecalllist.h @@ -220,10 +220,6 @@ FCFuncStart(gSystem_RuntimeType) #endif // defined(FEATURE_COMINTEROP) FCFuncEnd() -FCFuncStart(gJitHelpers) - FCFuncElement("UnsafeSetArrayElement", JitHelpers::UnsafeSetArrayElement) -FCFuncEnd() - FCFuncStart(gCOMTypeHandleFuncs) FCFuncElement("CreateInstance", RuntimeTypeHandle::CreateInstance) FCFuncElement("CreateCaInstance", RuntimeTypeHandle::CreateCaInstance) @@ -750,7 +746,8 @@ FCFuncStart(gArrayFuncs) FCIntrinsicSig("GetLength", &gsig_IM_Int_RetInt, ArrayNative::GetLength, CORINFO_INTRINSIC_Array_GetDimLength) FCFuncElement("get_Length", ArrayNative::GetLengthNoRank) FCFuncElement("get_LongLength", ArrayNative::GetLongLengthNoRank) - FCFuncElement("GetDataPtrOffsetInternal", ArrayNative::GetDataPtrOffsetInternal) + FCFuncElement("GetRawArrayData", ArrayNative::GetRawArrayData) + FCFuncElement("GetElementSize", ArrayNative::GetElementSize) FCFuncElement("Initialize", ArrayNative::Initialize) FCFuncElement("Copy", ArrayNative::ArrayCopy) FCFuncElement("GetRawArrayGeometry", ArrayNative::GetRawArrayGeometry) @@ -766,8 +763,6 @@ FCFuncEnd() FCFuncStart(gBufferFuncs) FCFuncElement("BlockCopy", Buffer::BlockCopy) - FCFuncElement("_GetByte", Buffer::GetByte) - FCFuncElement("_SetByte", Buffer::SetByte) FCFuncElement("IsPrimitiveTypeArray", Buffer::IsPrimitiveTypeArray) FCFuncElement("_ByteLength", Buffer::ByteLength) #ifdef _TARGET_ARM_ @@ -814,9 +809,10 @@ FCFuncStart(gInteropMarshalFuncs) FCFuncElement("SetLastWin32Error", MarshalNative::SetLastWin32Error) FCFuncElement("SizeOfHelper", MarshalNative::SizeOfClass) FCFuncElement("GetSystemMaxDBCSCharSize", MarshalNative::GetSystemMaxDBCSCharSize) + FCFuncElement("StructureToPtr", MarshalNative::StructureToPtr) FCFuncElement("PtrToStructureHelper", MarshalNative::PtrToStructureHelper) FCFuncElement("DestroyStructure", MarshalNative::DestroyStructure) - FCFuncElement("UnsafeAddrOfPinnedArrayElement", MarshalNative::FCUnsafeAddrOfPinnedArrayElement) + FCFuncElement("IsPinnable", MarshalNative::IsPinnable) FCFuncElement("GetExceptionCode", ExceptionNative::GetExceptionCode) FCFuncElement("GetExceptionPointers", ExceptionNative::GetExceptionPointers) QCFuncElement("GetHINSTANCE", COMModule::GetHINSTANCE) @@ -824,9 +820,6 @@ FCFuncStart(gInteropMarshalFuncs) FCFuncElement("OffsetOfHelper", MarshalNative::OffsetOfHelper) QCFuncElement("InternalPrelink", MarshalNative::Prelink) - FCFuncElement("CopyToNative", MarshalNative::CopyToNative) - FCFuncElement("CopyToManaged", MarshalNative::CopyToManaged) - FCFuncElement("StructureToPtr", MarshalNative::StructureToPtr) FCFuncElement("ThrowExceptionForHRInternal", MarshalNative::ThrowExceptionForHR) FCFuncElement("GetExceptionForHRInternal", MarshalNative::GetExceptionForHR) FCFuncElement("GetDelegateForFunctionPointerInternal", MarshalNative::GetDelegateForFunctionPointerInternal) @@ -873,15 +866,8 @@ FCFuncStart(gInteropNativeLibraryFuncs) QCFuncElement("GetSymbol", NativeLibraryNative::GetSymbol) FCFuncEnd() -FCFuncStart(gArrayWithOffsetFuncs) - FCFuncElement("CalculateCount", MarshalNative::CalculateCount) -FCFuncEnd() - #ifdef FEATURE_COMINTEROP - - - #ifdef FEATURE_COMINTEROP_MANAGED_ACTIVATION FCFuncStart(gRegistrationFuncs) FCFuncElement("RegisterTypeForComClientsNative", RegisterTypeForComClientsNative) @@ -952,7 +938,7 @@ FCFuncStart(gOverlappedFuncs) FCFuncElement("GetOverlappedFromNative", GetOverlappedFromNative) FCFuncEnd() -FCFuncStart(gCompilerFuncs) +FCFuncStart(gRuntimeHelpers) FCFuncElement("GetObjectValue", ObjectNative::GetObjectValue) FCIntrinsic("InitializeArray", ArrayNative::InitializeArray, CORINFO_INTRINSIC_InitializeArray) FCFuncElement("_RunClassConstructor", ReflectionInvocation::RunClassConstructor) @@ -1217,7 +1203,6 @@ FCClassElement("ApplicationModel", "System", gApplicationModelFuncs) #endif FCClassElement("ArgIterator", "System", gVarArgFuncs) FCClassElement("Array", "System", gArrayFuncs) -FCClassElement("ArrayWithOffset", "System.Runtime.InteropServices", gArrayWithOffsetFuncs) FCClassElement("Assembly", "System.Reflection", gAssemblyFuncs) FCClassElement("AssemblyBuilder", "System.Reflection.Emit", gAssemblyBuilderFuncs) @@ -1256,7 +1241,6 @@ FCClassElement("IReflect", "System.Reflection", gStdMngIReflectFuncs) FCClassElement("InterfaceMarshaler", "System.StubHelpers", gInterfaceMarshalerFuncs) #endif FCClassElement("Interlocked", "System.Threading", gInterlockedFuncs) -FCClassElement("JitHelpers", "System.Runtime.CompilerServices", gJitHelpers) FCClassElement("LoaderAllocatorScout", "System.Reflection", gLoaderAllocatorFuncs) FCClassElement("ManifestBasedResourceGroveler", "System.Resources", gManifestBasedResourceGrovelerFuncs) FCClassElement("Marshal", "System.Runtime.InteropServices", gInteropMarshalFuncs) @@ -1304,7 +1288,7 @@ FCClassElement("RuntimeAssembly", "System.Reflection", gRuntimeAssemblyFuncs) FCClassElement("RuntimeClass", "System.Runtime.InteropServices.WindowsRuntime", gRuntimeClassFuncs) #endif // FEATURE_COMINTEROP FCClassElement("RuntimeFieldHandle", "System", gCOMFieldHandleNewFuncs) -FCClassElement("RuntimeHelpers", "System.Runtime.CompilerServices", gCompilerFuncs) +FCClassElement("RuntimeHelpers", "System.Runtime.CompilerServices", gRuntimeHelpers) FCClassElement("RuntimeImports", "System.Runtime", gRuntimeImportsFuncs) FCClassElement("RuntimeMethodHandle", "System", gRuntimeMethodHandle) FCClassElement("RuntimeModule", "System.Reflection", gCOMModuleFuncs) -- cgit v1.2.3