Fix Type.ContainsGenericParameters for function pointers

src/coreclr/vm/typedesc.cpp

@@ -104,6 +104,31 @@ BOOL TypeDesc::IsSharedByGenericInstantiations()
     return FALSE;
 }
 
+BOOL TypeDesc::ContainsGenericVariables(BOOL methodOnly)
+{
+    if (IsGenericVariable())
+    {
+        if (!methodOnly)
+            return TRUE;
+
+        PTR_TypeVarTypeDesc pTyVar = dac_cast<PTR_TypeVarTypeDesc>(this);
+        return TypeFromToken(pTyVar->GetTypeOrMethodDef()) == mdtMethodDef;
+    }
+
+    if (HasTypeParam())
+    {
+        return GetRootTypeParam().ContainsGenericVariables(methodOnly);
+    }
+
+    if (IsFnPtr())
+    {
+        return dac_cast<PTR_FnPtrTypeDesc>(this)->ContainsGenericVariables(methodOnly);
+    }
+
+    return FALSE;
+}
+
+
 PTR_BaseDomain TypeDesc::GetDomain()
 {
     CONTRACTL
@@ -1670,6 +1695,21 @@ FnPtrTypeDesc::IsSharedByGenericInstantiations()
     return FALSE;
 } // FnPtrTypeDesc::IsSharedByGenericInstantiations
 
+BOOL
+FnPtrTypeDesc::ContainsGenericVariables(BOOL methodOnly)
+{
+    LIMITED_METHOD_DAC_CONTRACT;
+
+    for (DWORD i = 0; i <= m_NumArgs; i++)
+    {
+        if (m_RetAndArgTypes[i].ContainsGenericVariables(methodOnly))
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+} // FnPtrTypeDesc::ContainsGenericVariables
+
 #ifndef DACCESS_COMPILE
 
 // Returns TRUE if all return and argument types are externally visible.

src/coreclr/vm/typedesc.h

@@ -182,6 +182,8 @@ class TypeDesc
 
     BOOL IsSharedByGenericInstantiations();
 
+    BOOL ContainsGenericVariables(BOOL methodOnly);
+
  protected:
     // See methodtable.h for details of the flags with the same name there
     enum
@@ -527,6 +529,8 @@ class FnPtrTypeDesc : public TypeDesc
 
     BOOL IsSharedByGenericInstantiations();
 
+    BOOL ContainsGenericVariables(BOOL methodOnly);
+
 #ifndef DACCESS_COMPILE
     // Returns TRUE if all return and argument types are externally visible.
     BOOL IsExternallyVisible() const;

src/coreclr/vm/typehandle.cpp

@@ -138,26 +138,10 @@ BOOL TypeHandle::ContainsGenericVariables(BOOL methodOnly /*=FALSE*/) const
     STATIC_CONTRACT_NOTHROW;
     SUPPORTS_DAC;
 
-    if (HasTypeParam())
-    {
-        return GetTypeParam().ContainsGenericVariables(methodOnly);
-    }
-
-    if (IsGenericVariable())
-    {
-        if (!methodOnly)
-            return TRUE;
-
-        PTR_TypeVarTypeDesc pTyVar = dac_cast<PTR_TypeVarTypeDesc>(AsTypeDesc());
-        return TypeFromToken(pTyVar->GetTypeOrMethodDef()) == mdtMethodDef;
-    }
-    else if (HasInstantiation())
-    {
-        if (GetMethodTable()->ContainsGenericVariables(methodOnly))
-            return TRUE;
-    }
-
-    return FALSE;
+    if (IsTypeDesc())
+        return AsTypeDesc()->ContainsGenericVariables(methodOnly);
+    else
+        return AsMethodTable()->ContainsGenericVariables(methodOnly);
 }
 
 //@GENERICS:

src/libraries/Common/tests/System/FunctionPointerTests.cs

@@ -156,6 +156,11 @@ public static unsafe void FunctionPointerReturn()
             Assert.True(fcnPtr2.IsFunctionPointer);
 
             Assert.True(fcnPtr1.IsFunctionPointerEqual(fcnPtr2));
+
+            MethodInfo m3 = t.GetMethod(nameof(FunctionPointerHolder.GenericMethodReturnValue), Bindings);
+            Type fcnPtr3 = m3.ReturnType;
+            Assert.True(fcnPtr3.IsFunctionPointer);
+            Assert.True(fcnPtr3.ContainsGenericParameters);
         }
 
         [Fact]
@@ -278,6 +283,8 @@ private unsafe class FunctionPointerHolder
             public delegate* unmanaged[Stdcall, MemberFunction]<string, ref bool*, MyClass, in MyStruct, double> SeveralArguments() => default;
             public delegate*<in int, out int, void> RequiredModifiers() => default;
 
+            public delegate*<T> GenericMethodReturnValue<T>() => default;
+
             public class MyClass { }
             public struct MyStruct { }
         }

src/libraries/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/Types/RoFunctionPointerType.cs

@@ -147,7 +147,23 @@ public sealed override bool Equals([NotNullWhen(true)] object? obj)
         public sealed override bool IsGenericParameter => false;
         public sealed override bool IsGenericTypeParameter => false;
         public sealed override bool IsGenericMethodParameter => false;
-        public sealed override bool ContainsGenericParameters => IsGenericTypeDefinition;
+
+        public sealed override bool ContainsGenericParameters
+        {
+            get
+            {
+                if (_returnType.ContainsGenericParameters)
+                    return true;
+
+                foreach (Type parameterType in _parameterTypes)
+                {
+                    if (parameterType.ContainsGenericParameters)
+                        return true;
+                }
+
+                return false;
+            }
+        }
 
         protected sealed override TypeCode GetTypeCodeImpl() => TypeCode.Object;
 

src/mono/System.Private.CoreLib/src/System/RuntimeType.Mono.cs

@@ -2048,6 +2048,16 @@ public override bool ContainsGenericParameters
                 if (HasElementType)
                     return GetElementType().ContainsGenericParameters;
 
+                if (IsFunctionPointer)
+                {
+                    if (GetFunctionPointerReturnType().ContainsGenericParameters)
+                        return true;
+
+                    foreach (Type arg in GetFunctionPointerParameterTypes())
+                        if (arg.ContainsGenericParameters)
+                            return true;
+                }
+
                 return false;
             }
         }