[netcore] Allow different enums as return type in CreateDelega… (#15787)

* Relaxed check for return type in CreateDelegate * fix build errors
mono · Jul 24, 2019 · 1224943 · filipnavara · Jul 24, 2019 · marek-safar
1 parent 2a01e1b
commit 1224943
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/netcore/CoreFX.issues.rsp b/netcore/CoreFX.issues.rsp
@@ -225,21 +225,6 @@
 # When test is run, xunit claims it's not a part of the test suite 
 #-nomethod System.Net.Http.Functional.Tests.SocketsHttpHandler_HttpClientHandler_ClientCertificates_Test.AutomaticOrManual_DoesntFailRegardlessOfWhetherClientCertsAreAvailable
 
-####################################################################
-##  System.Net.HttpListener.Tests
-####################################################################
-
-# TODO:
-# System.ArgumentException : Cannot bind to the target method because its signature is not compatible with that of the delegate type.
-# at System.Delegate.CreateDelegate(Type type, Object firstArgument, MethodInfo method, Boolean throwOnBindFailure, Boolean allowClosed)
-# at System.Delegate.CreateDelegate(Type type, MethodInfo method, Boolean throwOnBindFailure)
-# at System.Delegate.CreateDelegate(Type type, MethodInfo method)
-# at System.Reflection.RuntimeMethodInfo.CreateDelegate(Type delegateType)
-# at System.Net.CookieExtensions.IsRfc2965Variant(Cookie cookie)
-#
-# https://github.com/mono/mono/issues/15008
--noclass System.Net.Tests.HttpListenerResponseCookiesTests
-
 ####################################################################
 ##  System.Net.Sockets.Tests
 ####################################################################

diff --git a/netcore/CoreFX.issues_linux_arm64.rsp b/netcore/CoreFX.issues_linux_arm64.rsp
@@ -0,0 +1,2 @@
+# these tests are extremly slow on our arm64 CI
+-nonamespace System.Transactions.Tests
diff --git a/netcore/Makefile b/netcore/Makefile
@@ -38,6 +38,9 @@ PLATFORM_AOT_PREFIX := lib
 NETCORESDK_EXT = tar.gz
 UNZIPCMD = tar -xvf
 XUNIT_FLAGS = -notrait category=nonlinuxtests @../../../../CoreFX.issues_linux.rsp
+ifeq ($(COREARCH), arm64)
+XUNIT_FLAGS = $(XUNIT_FLAGS) -notrait category=nonlinuxtests @../../../../CoreFX.issues_linux_arm64.rsp
+endif
 TESTS_PLATFORM = Linux.x64
 DOTNET := $(shell ./init-tools.sh | tail -1)
 endif

diff --git a/netcore/System.Private.CoreLib/src/System/Delegate.cs b/netcore/System.Private.CoreLib/src/System/Delegate.cs
@@ -339,6 +339,17 @@ static bool IsReturnTypeMatch (Type delReturnType, Type returnType)
 				// Delegate covariance
 				if (!returnType.IsValueType && delReturnType.IsAssignableFrom (returnType))
 					returnMatch = true;
+				else
+				{
+					bool isDelArgEnum = delReturnType.IsEnum;
+					bool isArgEnum = returnType.IsEnum;
+					if (isArgEnum && isDelArgEnum)
+						returnMatch = Enum.GetUnderlyingType (delReturnType) == Enum.GetUnderlyingType (returnType);
+					else if (isDelArgEnum && Enum.GetUnderlyingType (delReturnType) == returnType)
+						returnMatch = true;
+					else if (isArgEnum && Enum.GetUnderlyingType (returnType) == delReturnType)
+						returnMatch = true;
+				}
 			}
 
 			return returnMatch;