Skip to content

Commit 985bd19

Browse files
committed
Update baselines
1 parent 78b8235 commit 985bd19

28 files changed

Lines changed: 2891 additions & 2933 deletions

File tree

tests/AheadOfTime/Trimming/check.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len, $callerLineNumber) {
6363
$allErrors = @()
6464

6565
# Check net9.0 trimmed assemblies
66-
$allErrors += CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.Core.dll" -expected_len 311808 -callerLineNumber 66
66+
$allErrors += CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.Core.dll" -expected_len 310272 -callerLineNumber 66
6767

6868
# Check net9.0 trimmed assemblies with static linked FSharpCore
69-
$allErrors += CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 9169408 -callerLineNumber 69
69+
$allErrors += CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 9168896 -callerLineNumber 69
7070

7171
# Check net9.0 trimmed assemblies with F# metadata resources removed
7272
$allErrors += CheckTrim -root "FSharpMetadataResource_Trimming_Test" -tfm "net9.0" -outputfile "FSharpMetadataResource_Trimming_Test.dll" -expected_len 7609344 -callerLineNumber 72

tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/Compare04.fsx.il.net472.bsl

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.assembly extern netstandard
99
{
1010
.publickeytoken = (CC 7B 13 FF CD 2D DD 51 )
11-
.ver 2:0:0:0
11+
.ver 2:1:0:0
1212
}
1313
.assembly assembly
1414
{
@@ -55,67 +55,65 @@
5555
IL_0003: nop
5656
IL_0004: ldc.i4.0
5757
IL_0005: stloc.1
58-
IL_0006: br IL_0097
58+
IL_0006: br IL_0092
5959

6060
IL_000b: ldstr "5"
6161
IL_0010: ldstr "5"
6262
IL_0015: call int32 [netstandard]System.String::CompareOrdinal(string,
6363
string)
6464
IL_001a: stloc.2
6565
IL_001b: ldloc.2
66-
IL_001c: brfalse.s IL_0025
66+
IL_001c: brfalse.s IL_0022
6767

6868
IL_001e: ldloc.2
6969
IL_001f: nop
70-
IL_0020: br IL_0092
71-
72-
IL_0025: ldc.r8 6.0999999999999996
73-
IL_002e: ldc.r8 7.0999999999999996
74-
IL_0037: clt
75-
IL_0039: brfalse.s IL_003f
76-
77-
IL_003b: ldc.i4.m1
78-
IL_003c: nop
79-
IL_003d: br.s IL_0092
80-
81-
IL_003f: ldc.r8 6.0999999999999996
82-
IL_0048: ldc.r8 7.0999999999999996
83-
IL_0051: cgt
84-
IL_0053: brfalse.s IL_0059
85-
86-
IL_0055: ldc.i4.1
87-
IL_0056: nop
88-
IL_0057: br.s IL_0092
89-
90-
IL_0059: ldc.r8 6.0999999999999996
91-
IL_0062: ldc.r8 7.0999999999999996
92-
IL_006b: ceq
93-
IL_006d: brfalse.s IL_0073
94-
95-
IL_006f: ldc.i4.0
96-
IL_0070: nop
97-
IL_0071: br.s IL_0092
98-
99-
IL_0073: call class [runtime]System.Collections.IComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericComparer()
100-
IL_0078: ldc.r8 6.0999999999999996
101-
IL_0081: ldc.r8 7.0999999999999996
102-
IL_008a: call int32 [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/HashCompare::GenericComparisonWithComparerIntrinsic<float64>(class [runtime]System.Collections.IComparer,
70+
IL_0020: br.s IL_008d
71+
72+
IL_0022: ldc.r8 6.0999999999999996
73+
IL_002b: ldc.r8 7.0999999999999996
74+
IL_0034: clt
75+
IL_0036: brfalse.s IL_003c
76+
77+
IL_0038: ldc.i4.m1
78+
IL_0039: nop
79+
IL_003a: br.s IL_008d
80+
81+
IL_003c: ldc.r8 6.0999999999999996
82+
IL_0045: ldc.r8 7.0999999999999996
83+
IL_004e: cgt
84+
IL_0050: brfalse.s IL_0056
85+
86+
IL_0052: ldc.i4.1
87+
IL_0053: nop
88+
IL_0054: br.s IL_008d
89+
90+
IL_0056: ldc.r8 6.0999999999999996
91+
IL_005f: ldc.r8 7.0999999999999996
92+
IL_0068: ceq
93+
IL_006a: brfalse.s IL_0070
94+
95+
IL_006c: ldc.i4.0
96+
IL_006d: nop
97+
IL_006e: br.s IL_008d
98+
99+
IL_0070: call class [runtime]System.Collections.IComparer [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives::get_GenericComparer()
100+
IL_0075: ldc.r8 6.0999999999999996
101+
IL_007e: ldc.r8 7.0999999999999996
102+
IL_0087: call int32 [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/HashCompare::GenericComparisonWithComparerIntrinsic<float64>(class [runtime]System.Collections.IComparer,
103103
!!0,
104104
!!0)
105-
IL_008f: nop
106-
IL_0090: br.s IL_0092
107-
108-
IL_0092: stloc.0
109-
IL_0093: ldloc.1
110-
IL_0094: ldc.i4.1
111-
IL_0095: add
112-
IL_0096: stloc.1
113-
IL_0097: ldloc.1
114-
IL_0098: ldc.i4 0x989681
115-
IL_009d: blt IL_000b
116-
117-
IL_00a2: ldloc.0
118-
IL_00a3: ret
105+
IL_008c: nop
106+
IL_008d: stloc.0
107+
IL_008e: ldloc.1
108+
IL_008f: ldc.i4.1
109+
IL_0090: add
110+
IL_0091: stloc.1
111+
IL_0092: ldloc.1
112+
IL_0093: ldc.i4 0x989681
113+
IL_0098: blt IL_000b
114+
115+
IL_009d: ldloc.0
116+
IL_009e: ret
119117
}
120118

121119
}
@@ -139,3 +137,4 @@
139137

140138

141139

140+

tests/FSharp.Compiler.ComponentTests/EmittedIL/GenericComparison/Equals03.fsx.il.net472.bsl

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.assembly extern netstandard
99
{
1010
.publickeytoken = (CC 7B 13 FF CD 2D DD 51 )
11-
.ver 2:0:0:0
11+
.ver 2:1:0:0
1212
}
1313
.assembly assembly
1414
{
@@ -21,16 +21,6 @@
2121

2222
.hash algorithm 0x00008004
2323
.ver 0:0:0:0
24-
}
25-
.mresource public FSharpSignatureCompressedData.assembly
26-
{
27-
28-
29-
}
30-
.mresource public FSharpOptimizationCompressedData.assembly
31-
{
32-
33-
3424
}
3525
.module assembly.exe
3626

@@ -64,34 +54,33 @@
6454
IL_0003: nop
6555
IL_0004: ldc.i4.0
6656
IL_0005: stloc.1
67-
IL_0006: br.s IL_0038
57+
IL_0006: br.s IL_0037
6858

69-
IL_0008: nop
70-
IL_0009: ldstr "5"
71-
IL_000e: ldstr "5"
72-
IL_0013: call bool [netstandard]System.String::Equals(string,
59+
IL_0008: ldstr "5"
60+
IL_000d: ldstr "5"
61+
IL_0012: call bool [netstandard]System.String::Equals(string,
7362
string)
74-
IL_0018: brfalse.s IL_0031
75-
76-
IL_001a: ldc.r8 6.0999999999999996
77-
IL_0023: ldc.r8 7.0999999999999996
78-
IL_002c: ceq
79-
IL_002e: nop
80-
IL_002f: br.s IL_0033
81-
82-
IL_0031: ldc.i4.0
83-
IL_0032: nop
84-
IL_0033: stloc.0
85-
IL_0034: ldloc.1
86-
IL_0035: ldc.i4.1
87-
IL_0036: add
88-
IL_0037: stloc.1
89-
IL_0038: ldloc.1
90-
IL_0039: ldc.i4 0x989681
91-
IL_003e: blt.s IL_0008
92-
93-
IL_0040: ldloc.0
94-
IL_0041: ret
63+
IL_0017: brfalse.s IL_0030
64+
65+
IL_0019: ldc.r8 6.0999999999999996
66+
IL_0022: ldc.r8 7.0999999999999996
67+
IL_002b: ceq
68+
IL_002d: nop
69+
IL_002e: br.s IL_0032
70+
71+
IL_0030: ldc.i4.0
72+
IL_0031: nop
73+
IL_0032: stloc.0
74+
IL_0033: ldloc.1
75+
IL_0034: ldc.i4.1
76+
IL_0035: add
77+
IL_0036: stloc.1
78+
IL_0037: ldloc.1
79+
IL_0038: ldc.i4 0x989681
80+
IL_003d: blt.s IL_0008
81+
82+
IL_003f: ldloc.0
83+
IL_0040: ret
9584
}
9685

9786
}

tests/FSharp.Compiler.ComponentTests/EmittedIL/Inlining/Match01.fs.RealInternalSignatureOff.il.net472.bsl

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,27 +1103,26 @@
11031103
{
11041104

11051105
.maxstack 8
1106-
IL_0000: nop
1107-
IL_0001: ldarg.0
1108-
IL_0002: call instance int32 assembly/Test1::get_Tag()
1109-
IL_0007: switch (
1110-
IL_001c,
1111-
IL_0028,
1112-
IL_002a,
1113-
IL_002c)
1114-
IL_001c: ldarg.0
1115-
IL_001d: castclass assembly/Test1/X11
1116-
IL_0022: ldfld int32 assembly/Test1/X11::item
1117-
IL_0027: ret
1118-
1119-
IL_0028: ldc.i4.2
1120-
IL_0029: ret
1121-
1122-
IL_002a: ldc.i4.3
1123-
IL_002b: ret
1124-
1125-
IL_002c: ldc.i4.4
1126-
IL_002d: ret
1106+
IL_0000: ldarg.0
1107+
IL_0001: call instance int32 assembly/Test1::get_Tag()
1108+
IL_0006: switch (
1109+
IL_001b,
1110+
IL_0027,
1111+
IL_0029,
1112+
IL_002b)
1113+
IL_001b: ldarg.0
1114+
IL_001c: castclass assembly/Test1/X11
1115+
IL_0021: ldfld int32 assembly/Test1/X11::item
1116+
IL_0026: ret
1117+
1118+
IL_0027: ldc.i4.2
1119+
IL_0028: ret
1120+
1121+
IL_0029: ldc.i4.3
1122+
IL_002a: ret
1123+
1124+
IL_002b: ldc.i4.4
1125+
IL_002c: ret
11271126
}
11281127

11291128
.method public static int32 fm(class assembly/Test1 y) cil managed

0 commit comments

Comments
 (0)