More thoroughly check for function pointers (#81344)

Fixes #81117.
dotnet · Jan 30, 2023 · fea626a · fea626a
1 parent 56f6609
commit fea626a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectedFieldNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectedFieldNode.cs
@@ -96,11 +96,17 @@ public override IEnumerable<DependencyListEntry> GetStaticDependencies(NodeFacto
             {
                 // Runtime reflection stack needs to obtain the type handle of the field
                 // (but there's no type handles for function pointers)
-                TypeDesc fieldTypeToCheck = _field.FieldType;
-                while (fieldTypeToCheck.IsParameterizedType)
-                    fieldTypeToCheck = ((ParameterizedType)fieldTypeToCheck).ParameterType;
+                static bool ContainsFunctionPointers(TypeDesc type)
+                {
+                    if (type.IsParameterizedType)
+                        return ContainsFunctionPointers(((ParameterizedType)type).ParameterType);
+                    foreach (TypeDesc instArg in type.Instantiation)
+                        if (ContainsFunctionPointers(instArg))
+                            return true;
+                    return type.IsFunctionPointer;
+                }
 
-                if (!fieldTypeToCheck.IsFunctionPointer)
+                if (!ContainsFunctionPointers(_field.FieldType))
                     dependencies.Add(factory.MaximallyConstructableType(_field.FieldType.NormalizeInstantiation()), "Type of the field");
             }
 

diff --git a/...eclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionInvokeMapNode.cs b/...eclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionInvokeMapNode.cs
@@ -80,7 +80,16 @@ static void AddSignatureDependency(ref DependencyList dependencies, NodeFactory
 
                     // Function pointers are not supported yet.
                     // https://github.com/dotnet/runtime/issues/71883
-                    if (type.IsFunctionPointer)
+                    static bool ContainsFunctionPointers(TypeDesc type)
+                    {
+                        if (type.IsParameterizedType)
+                            return ContainsFunctionPointers(((ParameterizedType)type).ParameterType);
+                        foreach (TypeDesc instArg in type.Instantiation)
+                            if (ContainsFunctionPointers(instArg))
+                                return true;
+                        return type.IsFunctionPointer;
+                    }
+                    if (ContainsFunctionPointers(type))
                         return;
 
                     TypeDesc canonType = type.ConvertToCanonForm(CanonicalFormKind.Specific);