Skip to content

Nullness-related aggressive trimming of FSharp.Core #16387

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
merged 3 commits into from
Dec 5, 2023
Merged

Nullness-related aggressive trimming of FSharp.Core #16387

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
755a54d
nullness-related aggressive trimming of FSharp.Core
T-Gro Dec 5, 2023
abdcb0e
decreasing size thanks to new settings
T-Gro Dec 5, 2023
e2967d7
Simplify trimcheck, compressed and normal should be the same
T-Gro Dec 5, 2023
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
6 changes: 6 additions & 0 deletions src/FSharp.Core/ILLink.LinkAttributes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,11 @@
<type fullname="Microsoft.FSharp.Core.CompilerServices.TypeProviderXmlDocAttribute">
<attribute internal="RemoveAttributeInstances" />
</type>
<type fullname="System.Runtime.CompilerServices.NullableAttribute">
<attribute internal="RemoveAttributeInstances" />
</type>
<type fullname="System.Runtime.CompilerServices.NullableContextAttribute">
<attribute internal="RemoveAttributeInstances" />
</type>
</assembly>
</linker>
5 changes: 5 additions & 0 deletions src/FSharp.Core/ILLink.Substitutions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,10 @@
<resource name="FSharpOptimizationInfo.FSharp.Core" action="remove" />
<resource name="FSharpSignatureCompressedData.FSharp.Core" action="remove" />
<resource name="FSharpSignatureInfo.FSharp.Core" action="remove" />

<resource name="FSharpOptimizationCompressedDataB.FSharp.Core" action="remove" />
<resource name="FSharpOptimizationDataB.FSharp.Core" action="remove" />
<resource name="FSharpSignatureCompressedDataB.FSharp.Core" action="remove" />
<resource name="FSharpSignatureDataB.FSharp.Core" action="remove" />
</assembly>
</linker>
5 changes: 1 addition & 4 deletions tests/AheadOfTime/Trimming/check.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
function CheckTrim($root, $tfm, $outputfile, $expected_len) {
Write-Host "Publish and Execute: ${tfm} - ${root}"
Write-Host "Expecting ${expected_len}"
Write-Host "CompressAllMetadata value: ${compressAllMetadata}"

$cwd = Get-Location
Set-Location (Join-Path $PSScriptRoot "${root}")
Expand Down Expand Up @@ -39,11 +38,9 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len) {

# NOTE: Trimming now errors out on desktop TFMs, as shown below:
# error NETSDK1124: Trimming assemblies requires .NET Core 3.0 or higher.
$compressAllMetadata = $env:_kind -eq "-compressAllMetadata"
$expectedForSelfContained = if ($compressAllMetadata) {300032} else {288256}

# Check net7.0 trimmed assemblies
CheckTrim -root "SelfContained_Trimming_Test" -tfm "net8.0" -outputfile "FSharp.Core.dll" -expected_len $expectedForSelfContained
CheckTrim -root "SelfContained_Trimming_Test" -tfm "net8.0" -outputfile "FSharp.Core.dll" -expected_len 288256

# Check net7.0 trimmed assemblies
CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net8.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821760