Skip to content

Commit 7b0586c

Browse files
brianrourkebollKevinRansom
brianrourkeboll
and
KevinRansom
authored
Consolidate emitted IL for-loop tests (#17128)
* Consolidate emitted IL `for`-loop tests * The test sources and baselines for these were duplicated in #15484 to test the realsig feature, but that meant that the test _sources_ needed to be kept in sync by hand. This change uses the approach used in #16795 instead: it reuses the same test _source_ files and just adds duplicate _tests_ to check the emitted IL with realsig+. * Update netfx baselines * Fix find/replace bug * Unify netstandard assembly version in IL * Re-update baselines --------- Co-authored-by: Kevin Ransom (msft) <[email protected]>
1 parent 75c3558 commit 7b0586c

File tree

149 files changed

+943
-9706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+943
-9706
lines changed

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/RealInternalSignatureOff/ForEachOnArray01.fs‎ renamed to ‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForEachOnArray01.fs‎

File renamed without changes.

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/RealInternalSignatureOff/ForEachOnArray01.fs.il.bsl‎ renamed to ‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForEachOnArray01.fs.RealInternalSignatureOff.il.bsl‎

File renamed without changes.

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/RealInternalSignatureOn/ForEachOnArray01.fs.il.bsl‎ renamed to ‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForEachOnArray01.fs.RealInternalSignatureOn.il.bsl‎

File renamed without changes.

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/RealInternalSignatureOff/ForEachOnList01.fs‎ renamed to ‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForEachOnList01.fs‎

File renamed without changes.

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/RealInternalSignatureOn/ForEachOnList01.fs.il.netcore.release.bsl‎ renamed to ‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForEachOnList01.fs.RealInternalSignatureOff.il.bsl‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<int32,int32>
5353
{
5454
.field static assembly initonly class assembly/test6@38 @_instance
55-
.method assembly specialname rtspecialname
56-
instance void .ctor() cil managed
55+
.method assembly specialname rtspecialname instance void .ctor() cil managed
5756
{
5857
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
5958
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
@@ -64,8 +63,7 @@
6463
IL_0006: ret
6564
}
6665

67-
.method public strict virtual instance int32
68-
Invoke(int32 x) cil managed
66+
.method public strict virtual instance int32 Invoke(int32 x) cil managed
6967
{
7068

7169
.maxstack 8
@@ -75,8 +73,7 @@
7573
IL_0003: ret
7674
}
7775

78-
.method private specialname rtspecialname static
79-
void .cctor() cil managed
76+
.method private specialname rtspecialname static void .cctor() cil managed
8077
{
8178

8279
.maxstack 10
@@ -91,8 +88,7 @@
9188
extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<int32,int32>
9289
{
9390
.field static assembly initonly class assembly/test7@47 @_instance
94-
.method assembly specialname rtspecialname
95-
instance void .ctor() cil managed
91+
.method assembly specialname rtspecialname instance void .ctor() cil managed
9692
{
9793
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
9894
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
@@ -103,8 +99,7 @@
10399
IL_0006: ret
104100
}
105101

106-
.method public strict virtual instance int32
107-
Invoke(int32 x) cil managed
102+
.method public strict virtual instance int32 Invoke(int32 x) cil managed
108103
{
109104

110105
.maxstack 8
@@ -114,8 +109,7 @@
114109
IL_0003: ret
115110
}
116111

117-
.method private specialname rtspecialname static
118-
void .cctor() cil managed
112+
.method private specialname rtspecialname static void .cctor() cil managed
119113
{
120114

121115
.maxstack 10

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/RealInternalSignatureOff/ForEachOnList01.fs.il.netcore.release.bsl‎ renamed to ‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForEachOnList01.fs.RealInternalSignatureOn.il.bsl‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<int32,int32>
5353
{
5454
.field static assembly initonly class assembly/test6@38 @_instance
55-
.method assembly specialname rtspecialname
56-
instance void .ctor() cil managed
55+
.method assembly specialname rtspecialname instance void .ctor() cil managed
5756
{
5857
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
5958
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
@@ -64,8 +63,7 @@
6463
IL_0006: ret
6564
}
6665

67-
.method public strict virtual instance int32
68-
Invoke(int32 x) cil managed
66+
.method public strict virtual instance int32 Invoke(int32 x) cil managed
6967
{
7068

7169
.maxstack 8
@@ -75,8 +73,7 @@
7573
IL_0003: ret
7674
}
7775

78-
.method private specialname rtspecialname static
79-
void .cctor() cil managed
76+
.method private specialname rtspecialname static void .cctor() cil managed
8077
{
8178

8279
.maxstack 10
@@ -91,8 +88,7 @@
9188
extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<int32,int32>
9289
{
9390
.field static assembly initonly class assembly/test7@47 @_instance
94-
.method assembly specialname rtspecialname
95-
instance void .ctor() cil managed
91+
.method assembly specialname rtspecialname instance void .ctor() cil managed
9692
{
9793
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
9894
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
@@ -103,8 +99,7 @@
10399
IL_0006: ret
104100
}
105101

106-
.method public strict virtual instance int32
107-
Invoke(int32 x) cil managed
102+
.method public strict virtual instance int32 Invoke(int32 x) cil managed
108103
{
109104

110105
.maxstack 8
@@ -114,8 +109,7 @@
114109
IL_0003: ret
115110
}
116111

117-
.method private specialname rtspecialname static
118-
void .cctor() cil managed
112+
.method private specialname rtspecialname static void .cctor() cil managed
119113
{
120114

121115
.maxstack 10

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/RealInternalSignatureOff/ForEachOnString01.fs‎ renamed to ‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForEachOnString01.fs‎

File renamed without changes.

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/RealInternalSignatureOn/ForEachOnString01.fs.il.netcore.release.bsl‎ renamed to ‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForEachOnString01.fs.RealInternalSignatureOff.il.bsl‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<char,char>
5353
{
5454
.field static assembly initonly class assembly/test8@54 @_instance
55-
.method assembly specialname rtspecialname
56-
instance void .ctor() cil managed
55+
.method assembly specialname rtspecialname instance void .ctor() cil managed
5756
{
5857
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
5958
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
@@ -64,8 +63,7 @@
6463
IL_0006: ret
6564
}
6665

67-
.method public strict virtual instance char
68-
Invoke(char x) cil managed
66+
.method public strict virtual instance char Invoke(char x) cil managed
6967
{
7068

7169
.maxstack 8
@@ -77,8 +75,7 @@
7775
IL_0005: ret
7876
}
7977

80-
.method private specialname rtspecialname static
81-
void .cctor() cil managed
78+
.method private specialname rtspecialname static void .cctor() cil managed
8279
{
8380

8481
.maxstack 10
@@ -93,8 +90,7 @@
9390
extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<char,char>
9491
{
9592
.field static assembly initonly class assembly/test9@63 @_instance
96-
.method assembly specialname rtspecialname
97-
instance void .ctor() cil managed
93+
.method assembly specialname rtspecialname instance void .ctor() cil managed
9894
{
9995
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
10096
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
@@ -105,8 +101,7 @@
105101
IL_0006: ret
106102
}
107103

108-
.method public strict virtual instance char
109-
Invoke(char x) cil managed
104+
.method public strict virtual instance char Invoke(char x) cil managed
110105
{
111106

112107
.maxstack 8
@@ -118,8 +113,7 @@
118113
IL_0005: ret
119114
}
120115

121-
.method private specialname rtspecialname static
122-
void .cctor() cil managed
116+
.method private specialname rtspecialname static void .cctor() cil managed
123117
{
124118

125119
.maxstack 10

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/RealInternalSignatureOff/ForEachOnString01.fs.il.netcore.release.bsl‎ renamed to ‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForEachOnString01.fs.RealInternalSignatureOn.il.bsl‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<char,char>
5353
{
5454
.field static assembly initonly class assembly/test8@54 @_instance
55-
.method assembly specialname rtspecialname
56-
instance void .ctor() cil managed
55+
.method assembly specialname rtspecialname instance void .ctor() cil managed
5756
{
5857
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
5958
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
@@ -64,8 +63,7 @@
6463
IL_0006: ret
6564
}
6665

67-
.method public strict virtual instance char
68-
Invoke(char x) cil managed
66+
.method public strict virtual instance char Invoke(char x) cil managed
6967
{
7068

7169
.maxstack 8
@@ -77,8 +75,7 @@
7775
IL_0005: ret
7876
}
7977

80-
.method private specialname rtspecialname static
81-
void .cctor() cil managed
78+
.method private specialname rtspecialname static void .cctor() cil managed
8279
{
8380

8481
.maxstack 10
@@ -93,8 +90,7 @@
9390
extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<char,char>
9491
{
9592
.field static assembly initonly class assembly/test9@63 @_instance
96-
.method assembly specialname rtspecialname
97-
instance void .ctor() cil managed
93+
.method assembly specialname rtspecialname instance void .ctor() cil managed
9894
{
9995
.custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
10096
.custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 )
@@ -105,8 +101,7 @@
105101
IL_0006: ret
106102
}
107103

108-
.method public strict virtual instance char
109-
Invoke(char x) cil managed
104+
.method public strict virtual instance char Invoke(char x) cil managed
110105
{
111106

112107
.maxstack 8
@@ -118,8 +113,7 @@
118113
IL_0005: ret
119114
}
120115

121-
.method private specialname rtspecialname static
122-
void .cctor() cil managed
116+
.method private specialname rtspecialname static void .cctor() cil managed
123117
{
124118

125119
.maxstack 10

‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/RealInternalSignatureOff/ForEachRangeStepByte.fs‎ renamed to ‎tests/FSharp.Compiler.ComponentTests/EmittedIL/ForLoop/ForEachRangeStepByte.fs‎

File renamed without changes.

0 commit comments

Comments
 (0)