Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Aug 6, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f0d843
Fix crossgenning vtable gap members on non-Windows and add a test for…
jkoritzinsky Aug 5, 2020
f8a311c
Merge branch 'sparse-vtable-crossgen-test' of /mnt/d/source/runtime i…
jkoritzinsky Aug 5, 2020
bd1c66b
Test as part of the typeequivalence test suite instead of as part of …
jkoritzinsky Aug 5, 2020
e421329
PR feedback
jkoritzinsky Aug 5, 2020
9e0e9ee
Merge branch 'master' into sparse-vtable-crossgen-test
jkoritzinsky Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/coreclr/src/zap/zapimage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
}

//-----------------------------------------------------------------------------
Expand Down
2 changes: 0 additions & 2 deletions src/tests/baseservices/typeequivalence/contracts/TypeContracts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
2 changes: 0 additions & 2 deletions src/tests/baseservices/typeequivalence/impl/TypeImpl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
4 changes: 4 additions & 0 deletions src/tests/baseservices/typeequivalence/simple/Simple.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@ private static void TestGenericInterfaceEquivalence()

public static int Main(string[] noArgs)
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return 100;
}
try
{
InterfaceTypesFromDifferentAssembliesAreEquivalent();
Expand Down
2 changes: 0 additions & 2 deletions src/tests/baseservices/typeequivalence/simple/Simple.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down