Add reflection introspection support for function pointers

src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

@@ -191,6 +191,8 @@
     <Compile Include="$(BclSourcesRoot)\System\Reflection\Metadata\MetadataUpdater.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\MethodBase.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\MethodInvoker.CoreCLR.cs" />
+    <Compile Include="$(BclSourcesRoot)\System\Reflection\ModifiedFunctionPointerType.CoreCLR.cs" />
+    <Compile Include="$(BclSourcesRoot)\System\Reflection\ModifiedType.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\RtFieldInfo.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\RuntimeAssembly.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\RuntimeConstructorInfo.CoreCLR.cs" />
@@ -243,6 +245,9 @@
     <Compile Include="$(BclSourcesRoot)\System\TypeLoadException.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\TypeNameParser.cs" />
     <Compile Include="$(BclSourcesRoot)\System\ValueType.cs" />
+    <Compile Include="$(CommonPath)System\Collections\Generic\ArrayBuilder.cs">
+      <Link>Common\System\Collections\Generic\ArrayBuilder.cs</Link>
+    </Compile>    
   </ItemGroup>
   <ItemGroup Condition="'$(FeatureComWrappers)' == 'true'">
     <Compile Include="$(BclSourcesRoot)\System\Runtime\InteropServices\ComWrappers.cs" />

src/coreclr/System.Private.CoreLib/src/System/Reflection/MdImport.cs

@@ -8,28 +8,6 @@
 
 namespace System.Reflection
 {
-    [Flags]
-    internal enum MdSigCallingConvention : byte
-    {
-        CallConvMask = 0x0f,  // Calling convention is bottom 4 bits
-
-        Default = 0x00,
-        C = 0x01,
-        StdCall = 0x02,
-        ThisCall = 0x03,
-        FastCall = 0x04,
-        Vararg = 0x05,
-        Field = 0x06,
-        LocalSig = 0x07,
-        Property = 0x08,
-        Unmanaged = 0x09,
-        GenericInst = 0x0a,  // generic method instantiation
-
-        Generic = 0x10,  // Generic method sig with explicit number of type arguments (precedes ordinary parameter count)
-        HasThis = 0x20,  // Top bit indicates a 'this' parameter
-        ExplicitThis = 0x40,  // This parameter is explicitly in the signature
-    }
-
     [Flags]
     internal enum PInvokeAttributes
     {

src/coreclr/System.Private.CoreLib/src/System/Reflection/ModifiedFunctionPointerType.CoreCLR.cs

@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Reflection
+{
+    internal partial class ModifiedFunctionPointerType
+    {
+        private MdSigCallingConvention GetCallingConvention()
+        {
+            Signature? signature = GetSignature();
+            if (signature != null)
+            {
+                return (MdSigCallingConvention)signature.GetCallingConventionFromFunctionPointer(RootSignatureParameterIndex, NestedSignatureIndex);
+            }
+
+            return MdSigCallingConvention.Default;
+        }
+    }
+}

src/coreclr/System.Private.CoreLib/src/System/Reflection/ModifiedType.CoreCLR.cs

@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Reflection
+{
+    internal partial class ModifiedType
+    {
+        private Signature? _signature;
+
+        /// <summary>
+        /// Called from FieldInfo, PropertyInfo and ParameterInfo to create a modified type tree.
+        /// </summary>
+        public static ModifiedType Create(Type unmodifiedType, Type[] requiredModifiers, Type[] optionalModifiers, Signature? signature, int rootSignatureParameterIndex)
+        {
+            ModifiedType modifiedType;
+
+            if (unmodifiedType.IsFunctionPointer)
+            {
+                modifiedType = new ModifiedFunctionPointerType(unmodifiedType, requiredModifiers, optionalModifiers, rootSignatureParameterIndex);
+            }
+            else if (unmodifiedType.HasElementType)
+            {
+                modifiedType = new ModifiedContainerType(unmodifiedType, requiredModifiers, optionalModifiers, rootSignatureParameterIndex);
+            }
+            else if (unmodifiedType.IsGenericType)
+            {
+                modifiedType = new ModifiedGenericType(unmodifiedType, requiredModifiers, optionalModifiers, rootSignatureParameterIndex);
+            }
+            else
+            {
+                modifiedType = new ModifiedStandaloneType(unmodifiedType, requiredModifiers, optionalModifiers, rootSignatureParameterIndex);
+            }
+
+            modifiedType._signature = signature;
+            return modifiedType;
+        }
+
+        public Signature? GetSignature() => Root._signature;
+
+        private Type[] GetCustomModifiers(bool required)
+        {
+            if (_nestedSignatureParameterIndex >= 0)
+            {
+                Signature? signature = GetSignature();
+                if (signature != null)
+                {
+                    return signature.GetCustomModifiers(RootSignatureParameterIndex, required, _nestedSignatureIndex, _nestedSignatureParameterIndex) ?? EmptyTypes;
+                }
+            }
+
+            return EmptyTypes;
+        }
+    }
+}

src/coreclr/System.Private.CoreLib/src/System/Reflection/RtFieldInfo.cs

@@ -252,19 +252,31 @@ public override Type FieldType
         [MethodImpl(MethodImplOptions.NoInlining)]
         private RuntimeType InitializeFieldType()
         {
-            return m_fieldType = new Signature(this, m_declaringType).FieldType;
+            return m_fieldType = GetSignature().FieldType;
         }
 
         public override Type[] GetRequiredCustomModifiers()
         {
-            return new Signature(this, m_declaringType).GetCustomModifiers(1, true);
+            return GetSignature().GetCustomModifiers(1, true);
         }
 
         public override Type[] GetOptionalCustomModifiers()
         {
-            return new Signature(this, m_declaringType).GetCustomModifiers(1, false);
+            return GetSignature().GetCustomModifiers(1, false);
         }
 
+        internal Signature GetSignature() => new Signature(this, m_declaringType);
+
+        public override Type GetModifiedFieldType()
+        {
+            Signature sig = GetSignature();
+            return ModifiedType.Create(
+                FieldType,
+                sig.GetCustomModifiers(1, true),
+                sig.GetCustomModifiers(1, false),
+                sig,
+                rootSignatureParameterIndex: 1);
+        }
         #endregion
     }
 }

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeParameterInfo.cs

@@ -440,6 +440,16 @@ public override Type[] GetOptionalCustomModifiers()
                 m_signature.GetCustomModifiers(PositionImpl + 1, false);
         }
 
+        public override Type GetModifiedParameterType()
+        {
+            return ModifiedType.Create(
+                unmodifiedType: ParameterType,
+                GetRequiredCustomModifiers(),
+                GetOptionalCustomModifiers(),
+                m_signature,
+                rootSignatureParameterIndex: PositionImpl + 1);
+        }
+
         #endregion
 
         #region ICustomAttributeProvider

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimePropertyInfo.cs

@@ -79,7 +79,7 @@ internal bool EqualsSig(RuntimePropertyInfo target)
         {
             // @Asymmetry - Legacy policy is to remove duplicate properties, including hidden properties.
             //             The comparison is done by name and by sig. The EqualsSig comparison is expensive
-            //             but forutnetly it is only called when an inherited property is hidden by name or
+            //             but fortunately it is only called when an inherited property is hidden by name or
             //             when an interfaces declare properies with the same signature.
             //             Note that we intentionally don't resolve generic arguments so that we don't treat
             //             signatures that only match in certain instantiations as duplicates. This has the
@@ -205,6 +205,16 @@ public override Type[] GetOptionalCustomModifiers()
             return Signature.GetCustomModifiers(0, false);
         }
 
+        public override Type GetModifiedPropertyType()
+        {
+            return ModifiedType.Create(
+                PropertyType,
+                GetRequiredCustomModifiers(),
+                GetOptionalCustomModifiers(),
+                Signature,
+                rootSignatureParameterIndex: 0);
+        }
+
         internal object GetConstantValue(bool raw)
         {
             object? defaultValue = MdConstant.GetValue(GetRuntimeModule().MetadataImport, m_token, PropertyType.TypeHandle, raw);

src/coreclr/System.Private.CoreLib/src/System/RuntimeHandles.cs

@@ -159,6 +159,12 @@ internal static bool IsSZArray(RuntimeType type)
             return corElemType == CorElementType.ELEMENT_TYPE_SZARRAY;
         }
 
+        internal static bool IsFunctionPointer(RuntimeType type)
+        {
+            CorElementType corElemType = GetCorElementType(type);
+            return corElemType == CorElementType.ELEMENT_TYPE_FNPTR;
+        }
+
         internal static bool HasElementType(RuntimeType type)
         {
             CorElementType corElemType = GetCorElementType(type);
@@ -360,6 +366,12 @@ public ModuleHandle GetModuleHandle()
         [MethodImpl(MethodImplOptions.InternalCall)]
         internal static extern RuntimeMethodHandleInternal GetMethodAt(RuntimeType type, int slot);
 
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern Type[] GetArgumentTypesFromFunctionPointer(RuntimeType type);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal static extern bool IsUnmanagedFunctionPointer(RuntimeType type);
+
         // This is managed wrapper for MethodTable::IntroducedMethodIterator
         internal struct IntroducedMethodEnumerator
         {
@@ -1557,36 +1569,13 @@ internal static MetadataImport GetMetadataImport(RuntimeModule module)
 
     internal sealed unsafe class Signature
     {
-        #region Definitions
-        internal enum MdSigCallingConvention : byte
-        {
-            Generics = 0x10,
-            HasThis = 0x20,
-            ExplicitThis = 0x40,
-            CallConvMask = 0x0F,
-            Default = 0x00,
-            C = 0x01,
-            StdCall = 0x02,
-            ThisCall = 0x03,
-            FastCall = 0x04,
-            Vararg = 0x05,
-            Field = 0x06,
-            LocalSig = 0x07,
-            Property = 0x08,
-            Unmanaged = 0x09,
-            GenericInst = 0x0A,
-            Max = 0x0B,
-        }
-        #endregion
-
         #region FCalls
         [MemberNotNull(nameof(m_arguments))]
         [MemberNotNull(nameof(m_returnTypeORfieldType))]
         [MethodImpl(MethodImplOptions.InternalCall)]
         private extern void GetSignature(
             void* pCorSig, int cCorSig,
             RuntimeFieldHandleInternal fieldHandle, IRuntimeMethodInfo? methodHandle, RuntimeType? declaringType);
-
         #endregion
 
         #region Private Data Members
@@ -1646,7 +1635,13 @@ public Signature(void* pCorSig, int cCorSig, RuntimeType declaringType)
         internal static extern bool CompareSig(Signature sig1, Signature sig2);
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal extern Type[] GetCustomModifiers(int position, bool required);
+        internal extern Type[] GetCustomModifiers(int rootSignatureParameterIndex, bool required, int nestedSignatureIndex = -1, int nestedSignatureParameterIndex = -1);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal extern byte GetCallingConventionFromFunctionPointer(int rootSignatureParameterIndex, int nestedSignatureIndex);
+
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        internal extern bool IsUnmanagedFunctionPointer();
         #endregion
     }