Skip to content

Removing some linker warnings that are no longer needed #52457

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

Merged
3 commits merged into from
May 12, 2021
Merged

Removing some linker warnings that are no longer needed #52457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a79dc9d
Removing all shared framework linker noWarns
joperezr May 7, 2021
378193d
Addressing feedback and fixing Browser and windows legs
joperezr May 10, 2021
afd4ea3
Renaming ILLinkDescriptors file
joperezr May 11, 2021
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: 3 additions & 1 deletion src/coreclr/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
</PropertyGroup>

<ItemGroup>
<_ILLinkDescriptorsFilePaths Include="$(ILLinkDirectory)ILLink.Descriptors.xml" />
<_ILLinkDescriptorsFilePaths Include="$(ILLinkDirectory)ILLink.Descriptors.Shared.xml" />
<_ILLinkDescriptorsFilePaths Condition="'$(TargetsWindows)' == 'true'" Include="$(ILLinkDirectory)ILLink.Descriptors.Windows.xml" />
<_ILLinkDescriptorsFilePaths Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.Shared.xml" />
<_ILLinkDescriptorsFilePaths Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.EventSource.xml" />
</ItemGroup>

<!--
Expand Down
4 changes: 0 additions & 4 deletions ...CoreLib/src/ILLink/ILLink.Descriptors.xml → .../src/ILLink/ILLink.Descriptors.Shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
<type fullname="System.Runtime.InteropServices.ComTypes.IEnumerable" />
<type fullname="System.Runtime.InteropServices.ComTypes.IEnumerator" />
<type fullname="System.Runtime.InteropServices.CustomMarshalers.*" />
<!-- Workaround for https://github.com/mono/linker/issues/378 -->
<type fullname="System.Runtime.InteropServices.IDispatch" />
<type fullname="System.Runtime.InteropServices.IMarshal" />
<type fullname="Internal.Runtime.InteropServices.IClassFactory2" />

<!-- GetActualImplementationForArrayGenericIListOrIReadOnlyListMethod depends on slots of these interfaces not changing -->
<type fullname="System.Collections.Generic.IEnumerable`1" />
Expand Down
8 changes: 8 additions & 0 deletions src/coreclr/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Windows.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<linker>
<assembly fullname="System.Private.CoreLib">
<!-- Workaround for https://github.com/mono/linker/issues/378 -->
<type fullname="System.Runtime.InteropServices.IDispatch" />
<type fullname="System.Runtime.InteropServices.IMarshal" />
<type fullname="Internal.Runtime.InteropServices.IClassFactory2" />
</assembly>
</linker>
5 changes: 0 additions & 5 deletions ....CSharp/src/ILLink/ILLink.Descriptors.xml → .../src/ILLink/ILLink.Descriptors.Shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
<linker>
<assembly fullname="Microsoft.CSharp">
<!-- Required for COM event dispatch -->
<type fullname="System.Runtime.InteropServices.ComEventsSink"/>
</assembly>

<assembly fullname="Microsoft.CSharp" feature="System.Diagnostics.Debugger.IsSupported" featurevalue="true" featuredefault="true">
<!-- Required by the Expression Evaluator -->
<type fullname="Microsoft.CSharp.RuntimeBinder.DynamicMetaObjectProviderDebugView"/>
Expand Down
6 changes: 6 additions & 0 deletions src/libraries/Microsoft.CSharp/src/ILLink/ILLink.Descriptors.Windows.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<linker>
<assembly fullname="Microsoft.CSharp">
<!-- Required for COM event dispatch -->
<type fullname="System.Runtime.InteropServices.ComEventsSink"/>
</assembly>
</linker>
4 changes: 4 additions & 0 deletions src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
<DefineConstants Condition="'$(EnableComBinder)'=='true'">$(DefineConstants);ENABLECOMBINDER</DefineConstants>
<AllowUnsafeBlocks Condition="'$(EnableComBinder)'=='true'">true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<ILLinkDescriptorsXmls Include="$(ILLinkDirectory)ILLink.Descriptors.Shared.xml" />
<ILLinkDescriptorsXmls Condition="'$(TargetsWindows)' == 'true'" Include="$(ILLinkDirectory)ILLink.Descriptors.Windows.xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Microsoft\CSharp\RuntimeBinder\ArgumentObject.cs" />
<Compile Include="Microsoft\CSharp\RuntimeBinder\Binder.cs" />
Expand Down
0 ...ic.Core/src/ILLink/ILLink.Descriptors.xml → ...src/ILLink/ILLink.Descriptors.Windows.xml
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<RootNamespace />
<TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-windows</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<ILLinkDescriptorsXml Condition="'$(TargetsWindows)' == 'true'">$(MSBuildProjectDirectory)\ILLink\ILLink.Descriptors.Windows.xml</ILLinkDescriptorsXml>
</PropertyGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
<Compile Include="Microsoft\VisualBasic\Helpers\NativeMethods.vb" />
<Compile Include="Microsoft\VisualBasic\Helpers\NativeTypes.vb" />
Expand Down
7 changes: 7 additions & 0 deletions src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.EventSource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<linker>
<assembly fullname="System.Private.CoreLib" feature="System.Diagnostics.Tracing.EventSource.IsSupported" featurevalue="true" featuredefault="true">
<type fullname="System.Diagnostics.Tracing.RuntimeEventSource">
<method signature="System.Void Initialize()" />
</type>
</assembly>
</linker>
6 changes: 0 additions & 6 deletions src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,4 @@
<method name="GetApplyUpdateCapabilities" />
</type>
</assembly>

<assembly fullname="System.Private.CoreLib" feature="System.Diagnostics.Tracing.EventSource.IsSupported" featurevalue="true" featuredefault="true">
<type fullname="System.Diagnostics.Tracing.RuntimeEventSource">
<method signature="System.Void Initialize()" />
</type>
</assembly>
</linker>
13 changes: 0 additions & 13 deletions src/libraries/illink-sharedframework.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,6 @@
<RuntimePackILLinkArgs>$(ILLinkArgs)</RuntimePackILLinkArgs>
<!-- update debug symbols -->
<RuntimePackILLinkArgs>$(RuntimePackILLinkArgs) -b true</RuntimePackILLinkArgs>
<!-- suppress warnings with the following codes:
IL2009: Could not find method A in type B specified in resource C
IL2025: Duplicate preserve of A in B
-->
<LinkerNoWarn>IL2009;IL2025</LinkerNoWarn>
<!-- https://github.com/dotnet/runtime/issues/40336 - need to also suppress the following on non-Windows:
IL2008: Could not find type A specified in resource B
and on 32-bit builds:
IL2012: Could not find field 'Padding' in type 'System.Runtime.CompilerServices.RawArrayData'
-->
<LinkerNoWarn Condition="'$(TargetOS)' != 'windows'">$(LinkerNoWarn);IL2008</LinkerNoWarn>
<LinkerNoWarn Condition="'$(Platform)' != 'x64' AND '$(Platform)' != 'arm64'">$(LinkerNoWarn);IL2012</LinkerNoWarn>
<RuntimePackILLinkArgs>$(RuntimePackILLinkArgs) --nowarn $(LinkerNoWarn)</RuntimePackILLinkArgs>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
<ItemGroup>
<ILLinkDescriptorsXmls Include="$(ILLinkDirectory)ILLink.Descriptors.xml" />
<ILLinkDescriptorsXmls Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.Shared.xml" />
<ILLinkDescriptorsXmls Condition="'$(FeaturePerfTracing)' == 'true'" Include="$(CoreLibSharedDir)ILLink\ILLink.Descriptors.EventSource.xml" />

<ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.xml" />
<ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.$(Platform).xml"
Expand Down