From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 6 Aug 2020 00:52:34 +0000 (-0700)
Subject: Fix crossgenning of sparse COM interface types on non-Windows and add test (#40404)
X-Git-Tag: submit/tizen/20210909.063632~6193
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=222415c56c9ea73530444768c0e68413eb374f5d;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix crossgenning of sparse COM interface types on non-Windows and add test (#40404)
---

diff --git a/src/coreclr/src/zap/zapimage.cpp b/src/coreclr/src/zap/zapimage.cpp
index e113942..6939219 100644
--- a/src/coreclr/src/zap/zapimage.cpp
+++ b/src/coreclr/src/zap/zapimage.cpp
@@ -1894,7 +1894,6 @@ void ZapImage::TryCompileMethodStub(LPVOID pContext, CORINFO_METHOD_HANDLE hStub
 //-----------------------------------------------------------------------------
 BOOL ZapImage::IsVTableGapMethod(mdMethodDef md)
 {
-#ifdef FEATURE_COMINTEROP
     HRESULT hr;
     DWORD dwAttributes;
 
@@ -1916,9 +1915,6 @@ BOOL ZapImage::IsVTableGapMethod(mdMethodDef md)
 
     // If we make it to here we have a vtable gap method.
     return TRUE;
-#else
-    return FALSE;
-#endif // FEATURE_COMINTEROP
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/tests/baseservices/typeequivalence/contracts/TypeContracts.csproj b/src/tests/baseservices/typeequivalence/contracts/TypeContracts.csproj
index ce626dfdd..306758e 100644
--- a/src/tests/baseservices/typeequivalence/contracts/TypeContracts.csproj
+++ b/src/tests/baseservices/typeequivalence/contracts/TypeContracts.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <!-- The Type Equivalence feature is unsupported outside of windows -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Types.cs" />
diff --git a/src/tests/baseservices/typeequivalence/impl/TypeImpl.csproj b/src/tests/baseservices/typeequivalence/impl/TypeImpl.csproj
index 4c64a59..b916b70 100644
--- a/src/tests/baseservices/typeequivalence/impl/TypeImpl.csproj
+++ b/src/tests/baseservices/typeequivalence/impl/TypeImpl.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <!-- The Type Equivalence feature is unsupported outside of windows -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Impls.cs" />
diff --git a/src/tests/baseservices/typeequivalence/simple/Simple.cs b/src/tests/baseservices/typeequivalence/simple/Simple.cs
index 9b0a63e..fbfb5db 100644
--- a/src/tests/baseservices/typeequivalence/simple/Simple.cs
+++ b/src/tests/baseservices/typeequivalence/simple/Simple.cs
@@ -216,6 +216,10 @@ public class Simple
 
     public static int Main(string[] noArgs)
     {
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            return 100;
+        }
         try
         {
             InterfaceTypesFromDifferentAssembliesAreEquivalent();
diff --git a/src/tests/baseservices/typeequivalence/simple/Simple.csproj b/src/tests/baseservices/typeequivalence/simple/Simple.csproj
index e53815c..028b3cc 100644
--- a/src/tests/baseservices/typeequivalence/simple/Simple.csproj
+++ b/src/tests/baseservices/typeequivalence/simple/Simple.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <!-- The Type Equivalence feature is unsupported outside of windows -->
-    <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Simple.cs" />