Reduce QCalls

dotnet · jkotas · Jun 27, 2024 · May 27, 2024 · May 27, 2024 · May 27, 2024
commit fbb9d71b6c1aec3bdd68ca538b43c801201516ff
diff --git a/...eclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs b/...eclr/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs
@@ -21,7 +21,7 @@ public static unsafe void InitializeArray(Array array, RuntimeFieldHandle fldHan
             if (array is null)
                 ThrowHelper.ThrowArgumentNullException(ExceptionArgument.array);
 
-            if ((RuntimeFieldHandle.GetAttributes(fldInfo.Value) & FieldAttributes.HasFieldRVA) == 0)
+            if (!RuntimeFieldHandle.GetRVAFieldInfo(new QCallFieldHandle(ref fldInfo), out IntPtr address, out uint size))
                 throw new ArgumentException(SR.Argument_BadFieldForInitializeArray);
 
             // Note that we do not check that the field is actually in the PE file that is initializing
@@ -35,13 +35,11 @@ public static unsafe void InitializeArray(Array array, RuntimeFieldHandle fldHan
             MethodTable* pMT = GetMethodTable(array);
             nuint totalSize = pMT->ComponentSize * array.NativeLength;
 
-            uint size = RuntimeFieldHandle.GetFieldSize(new QCallFieldHandle(ref fldInfo));
-
             // make certain you don't go off the end of the rva static
             if (totalSize > size)
                 throw new ArgumentException(SR.Argument_BadFieldForInitializeArray);
 
-            void* src = (void*)RuntimeFieldHandle.GetStaticFieldAddress(fldInfo);
+            void* src = (void*)address;
             ref byte dst = ref MemoryMarshal.GetArrayDataReference(array);
 
             Debug.Assert(!pMT->GetArrayElementTypeHandle().AsMethodTable()->ContainsGCPointers);
@@ -86,7 +84,7 @@ public static unsafe void InitializeArray(Array array, RuntimeFieldHandle fldHan
         {
             IRuntimeFieldInfo fldInfo = fldHandle.GetRuntimeFieldInfo();
 
-            if ((RuntimeFieldHandle.GetAttributes(fldInfo.Value) & FieldAttributes.HasFieldRVA) == 0)
+            if (!RuntimeFieldHandle.GetRVAFieldInfo(new QCallFieldHandle(ref fldInfo), out IntPtr data, out uint totalSize))
                 throw new ArgumentException(SR.Argument_BadFieldForInitializeArray);
 
             TypeHandle th = new TypeHandle((void*)targetTypeHandle.Value);
@@ -95,10 +93,8 @@ public static unsafe void InitializeArray(Array array, RuntimeFieldHandle fldHan
             if (!th.GetVerifierCorElementType().IsPrimitiveType()) // Enum is included
                 throw new ArgumentException(SR.Argument_MustBePrimitiveArray);
 
-            uint totalSize = RuntimeFieldHandle.GetFieldSize(new QCallFieldHandle(ref fldInfo));
             uint targetTypeSize = th.AsMethodTable()->GetNumInstanceFieldBytes();
 
-            IntPtr data = RuntimeFieldHandle.GetStaticFieldAddress(fldInfo);
             if (data % targetTypeSize != 0)
                 throw new ArgumentException(SR.Argument_BadFieldForInitializeArray);
 

diff --git a/src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs b/src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs
@@ -1191,10 +1191,11 @@ internal static RuntimeType GetApproxDeclaringType(IRuntimeFieldInfo field)
         internal static extern int GetInstanceFieldOffset(RtFieldInfo field);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal static extern IntPtr GetStaticFieldAddress(IRuntimeFieldInfo field);
+        internal static extern IntPtr GetStaticFieldAddress(RtFieldInfo field);
 
-        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "RuntimeFieldHandle_GetFieldSize")]
-        internal static partial uint GetFieldSize(QCallFieldHandle field);
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "RuntimeFieldHandle_GetRVAFieldInfo")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool GetRVAFieldInfo(QCallFieldHandle field, out IntPtr address, out uint size);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
         internal static extern int GetToken(RtFieldInfo field);

diff --git a/src/coreclr/vm/qcallentrypoints.cpp b/src/coreclr/vm/qcallentrypoints.cpp
@@ -132,7 +132,7 @@ static const Entry s_QCall[] =
     DllImportEntry(RuntimeModule_GetScopeName)
     DllImportEntry(RuntimeModule_GetFullyQualifiedName)
     DllImportEntry(RuntimeModule_GetTypes)
-    DllImportEntry(RuntimeFieldHandle_GetFieldSize)
+    DllImportEntry(RuntimeFieldHandle_GetRVAFieldInfo)
     DllImportEntry(StackFrame_GetMethodDescFromNativeIP)
     DllImportEntry(ModuleBuilder_GetStringConstant)
     DllImportEntry(ModuleBuilder_GetTypeRef)

diff --git a/src/coreclr/vm/reflectioninvocation.cpp b/src/coreclr/vm/reflectioninvocation.cpp
@@ -1259,14 +1259,26 @@ FCIMPL1(void*, RuntimeFieldHandle::GetStaticFieldAddress, ReflectFieldObject *pF
 }
 FCIMPLEND
 
-extern "C" UINT QCALLTYPE RuntimeFieldHandle_GetFieldSize(QCall::FieldHandle pField)
+extern "C" BOOL QCALLTYPE RuntimeFieldHandle_GetRVAFieldInfo(QCall::FieldHandle pField, void** address, UINT* size)
 {
     QCALL_CONTRACT;
 
-    UINT ret = 0;
+    BOOL ret = FALSE;
 
     BEGIN_QCALL;
-    ret = pField->LoadSize();
+
+    FieldDesc* pFieldDesc = pField.m_pField;
+
+    if (pFieldDesc != NULL && pFieldDesc->IsRVA())
+    {
+        ret = TRUE;
+
+        Module* pModule = pFieldDesc->GetModule();
+        *address = pModule->GetRvaField(pFieldDesc->GetOffset());
+
+        *size = pFieldDesc->LoadSize();
+    }
+
     END_QCALL;
 
     return ret;
@@ -2129,4 +2141,4 @@ extern "C" void QCALLTYPE ReflectionInvocation_GetBoxInfo(
     pMT->EnsureInstanceActive();
 
     END_QCALL;
-}
+}
diff --git a/src/coreclr/vm/runtimehandles.h b/src/coreclr/vm/runtimehandles.h
@@ -309,7 +309,7 @@ class RuntimeFieldHandle {
     static FCDECL1(FC_BOOL_RET, AcquiresContextFromThis, FieldDesc *pField);
     static FCDECL1(Object*, GetLoaderAllocator, FieldDesc *pField);
 };
-extern "C" UINT QCALLTYPE RuntimeFieldHandle_GetFieldSize(QCall::FieldHandle pField);
+extern "C" BOOL QCALLTYPE RuntimeFieldHandle_GetRVAFieldInfo(QCall::FieldHandle pField, void** address, UINT* size);
 
 class ModuleHandle {