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) <codecutter@hotmail.com>
dotnet · May 13, 2024 · 7b0586c · 7b0586c
1 parent 75c3558
commit 7b0586c
Show file tree

Hide file tree

Showing 149 changed files with 943 additions and 9,706 deletions.
diff --git a/...lInternalSignatureOff/ForEachOnArray01.fs → ...sts/EmittedIL/ForLoop/ForEachOnArray01.fs b/...lInternalSignatureOff/ForEachOnArray01.fs → ...sts/EmittedIL/ForLoop/ForEachOnArray01.fs
diff --git a/...alSignatureOff/ForEachOnArray01.fs.il.bsl → ...rray01.fs.RealInternalSignatureOff.il.bsl b/...alSignatureOff/ForEachOnArray01.fs.il.bsl → ...rray01.fs.RealInternalSignatureOff.il.bsl
diff --git a/...nalSignatureOn/ForEachOnArray01.fs.il.bsl → ...Array01.fs.RealInternalSignatureOn.il.bsl b/...nalSignatureOn/ForEachOnArray01.fs.il.bsl → ...Array01.fs.RealInternalSignatureOn.il.bsl
diff --git a/...alInternalSignatureOff/ForEachOnList01.fs → ...ests/EmittedIL/ForLoop/ForEachOnList01.fs b/...alInternalSignatureOff/ForEachOnList01.fs → ...ests/EmittedIL/ForLoop/ForEachOnList01.fs
diff --git a/...ForEachOnList01.fs.il.netcore.release.bsl → ...List01.fs.RealInternalSignatureOff.il.bsl b/...ForEachOnList01.fs.il.netcore.release.bsl → ...List01.fs.RealInternalSignatureOff.il.bsl
@@ -52,8 +52,7 @@
          extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<int32,int32>
   {
     .field static assembly initonly class assembly/test6@38 @_instance
-    .method assembly specialname rtspecialname 
-            instance void  .ctor() cil managed
+    .method assembly specialname rtspecialname instance void  .ctor() cil managed
     {
       .custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) 
       .custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) 
@@ -64,8 +63,7 @@
       IL_0006:  ret
     } 
 
-    .method public strict virtual instance int32 
-            Invoke(int32 x) cil managed
+    .method public strict virtual instance int32 Invoke(int32 x) cil managed
     {
 
       .maxstack  8
@@ -75,8 +73,7 @@
       IL_0003:  ret
     } 
 
-    .method private specialname rtspecialname static 
-            void  .cctor() cil managed
+    .method private specialname rtspecialname static void  .cctor() cil managed
     {
 
       .maxstack  10
@@ -91,8 +88,7 @@
          extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<int32,int32>
   {
     .field static assembly initonly class assembly/test7@47 @_instance
-    .method assembly specialname rtspecialname 
-            instance void  .ctor() cil managed
+    .method assembly specialname rtspecialname instance void  .ctor() cil managed
     {
       .custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) 
       .custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) 
@@ -103,8 +99,7 @@
       IL_0006:  ret
     } 
 
-    .method public strict virtual instance int32 
-            Invoke(int32 x) cil managed
+    .method public strict virtual instance int32 Invoke(int32 x) cil managed
     {
 
       .maxstack  8
@@ -114,8 +109,7 @@
       IL_0003:  ret
     } 
 
-    .method private specialname rtspecialname static 
-            void  .cctor() cil managed
+    .method private specialname rtspecialname static void  .cctor() cil managed
     {
 
       .maxstack  10

diff --git a/...ForEachOnList01.fs.il.netcore.release.bsl → ...nList01.fs.RealInternalSignatureOn.il.bsl b/...ForEachOnList01.fs.il.netcore.release.bsl → ...nList01.fs.RealInternalSignatureOn.il.bsl
@@ -52,8 +52,7 @@
          extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<int32,int32>
   {
     .field static assembly initonly class assembly/test6@38 @_instance
-    .method assembly specialname rtspecialname 
-            instance void  .ctor() cil managed
+    .method assembly specialname rtspecialname instance void  .ctor() cil managed
     {
       .custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) 
       .custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) 
@@ -64,8 +63,7 @@
       IL_0006:  ret
     } 
 
-    .method public strict virtual instance int32 
-            Invoke(int32 x) cil managed
+    .method public strict virtual instance int32 Invoke(int32 x) cil managed
     {
 
       .maxstack  8
@@ -75,8 +73,7 @@
       IL_0003:  ret
     } 
 
-    .method private specialname rtspecialname static 
-            void  .cctor() cil managed
+    .method private specialname rtspecialname static void  .cctor() cil managed
     {
 
       .maxstack  10
@@ -91,8 +88,7 @@
          extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<int32,int32>
   {
     .field static assembly initonly class assembly/test7@47 @_instance
-    .method assembly specialname rtspecialname 
-            instance void  .ctor() cil managed
+    .method assembly specialname rtspecialname instance void  .ctor() cil managed
     {
       .custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) 
       .custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) 
@@ -103,8 +99,7 @@
       IL_0006:  ret
     } 
 
-    .method public strict virtual instance int32 
-            Invoke(int32 x) cil managed
+    .method public strict virtual instance int32 Invoke(int32 x) cil managed
     {
 
       .maxstack  8
@@ -114,8 +109,7 @@
       IL_0003:  ret
     } 
 
-    .method private specialname rtspecialname static 
-            void  .cctor() cil managed
+    .method private specialname rtspecialname static void  .cctor() cil managed
     {
 
       .maxstack  10

diff --git a/...InternalSignatureOff/ForEachOnString01.fs → ...ts/EmittedIL/ForLoop/ForEachOnString01.fs b/...InternalSignatureOff/ForEachOnString01.fs → ...ts/EmittedIL/ForLoop/ForEachOnString01.fs
diff --git a/...rEachOnString01.fs.il.netcore.release.bsl → ...ring01.fs.RealInternalSignatureOff.il.bsl b/...rEachOnString01.fs.il.netcore.release.bsl → ...ring01.fs.RealInternalSignatureOff.il.bsl
@@ -52,8 +52,7 @@
          extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<char,char>
   {
     .field static assembly initonly class assembly/test8@54 @_instance
-    .method assembly specialname rtspecialname 
-            instance void  .ctor() cil managed
+    .method assembly specialname rtspecialname instance void  .ctor() cil managed
     {
       .custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) 
       .custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) 
@@ -64,8 +63,7 @@
       IL_0006:  ret
     } 
 
-    .method public strict virtual instance char 
-            Invoke(char x) cil managed
+    .method public strict virtual instance char Invoke(char x) cil managed
     {
 
       .maxstack  8
@@ -77,8 +75,7 @@
       IL_0005:  ret
     } 
 
-    .method private specialname rtspecialname static 
-            void  .cctor() cil managed
+    .method private specialname rtspecialname static void  .cctor() cil managed
     {
 
       .maxstack  10
@@ -93,8 +90,7 @@
          extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<char,char>
   {
     .field static assembly initonly class assembly/test9@63 @_instance
-    .method assembly specialname rtspecialname 
-            instance void  .ctor() cil managed
+    .method assembly specialname rtspecialname instance void  .ctor() cil managed
     {
       .custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) 
       .custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) 
@@ -105,8 +101,7 @@
       IL_0006:  ret
     } 
 
-    .method public strict virtual instance char 
-            Invoke(char x) cil managed
+    .method public strict virtual instance char Invoke(char x) cil managed
     {
 
       .maxstack  8
@@ -118,8 +113,7 @@
       IL_0005:  ret
     } 
 
-    .method private specialname rtspecialname static 
-            void  .cctor() cil managed
+    .method private specialname rtspecialname static void  .cctor() cil managed
     {
 
       .maxstack  10

diff --git a/...rEachOnString01.fs.il.netcore.release.bsl → ...tring01.fs.RealInternalSignatureOn.il.bsl b/...rEachOnString01.fs.il.netcore.release.bsl → ...tring01.fs.RealInternalSignatureOn.il.bsl
@@ -52,8 +52,7 @@
          extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<char,char>
   {
     .field static assembly initonly class assembly/test8@54 @_instance
-    .method assembly specialname rtspecialname 
-            instance void  .ctor() cil managed
+    .method assembly specialname rtspecialname instance void  .ctor() cil managed
     {
       .custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) 
       .custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) 
@@ -64,8 +63,7 @@
       IL_0006:  ret
     } 
 
-    .method public strict virtual instance char 
-            Invoke(char x) cil managed
+    .method public strict virtual instance char Invoke(char x) cil managed
     {
 
       .maxstack  8
@@ -77,8 +75,7 @@
       IL_0005:  ret
     } 
 
-    .method private specialname rtspecialname static 
-            void  .cctor() cil managed
+    .method private specialname rtspecialname static void  .cctor() cil managed
     {
 
       .maxstack  10
@@ -93,8 +90,7 @@
          extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<char,char>
   {
     .field static assembly initonly class assembly/test9@63 @_instance
-    .method assembly specialname rtspecialname 
-            instance void  .ctor() cil managed
+    .method assembly specialname rtspecialname instance void  .ctor() cil managed
     {
       .custom instance void [runtime]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) 
       .custom instance void [runtime]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) 
@@ -105,8 +101,7 @@
       IL_0006:  ret
     } 
 
-    .method public strict virtual instance char 
-            Invoke(char x) cil managed
+    .method public strict virtual instance char Invoke(char x) cil managed
     {
 
       .maxstack  8
@@ -118,8 +113,7 @@
       IL_0005:  ret
     } 
 
-    .method private specialname rtspecialname static 
-            void  .cctor() cil managed
+    .method private specialname rtspecialname static void  .cctor() cil managed
     {
 
       .maxstack  10

diff --git a/...ernalSignatureOff/ForEachRangeStepByte.fs → ...EmittedIL/ForLoop/ForEachRangeStepByte.fs b/...ernalSignatureOff/ForEachRangeStepByte.fs → ...EmittedIL/ForLoop/ForEachRangeStepByte.fs
diff --git a/...ureOff/ForEachRangeStepByte.fs.opt.il.bsl → ...te.fs.RealInternalSignatureOff.opt.il.bsl b/...ureOff/ForEachRangeStepByte.fs.opt.il.bsl → ...te.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...tureOn/ForEachRangeStepByte.fs.opt.il.bsl → ...yte.fs.RealInternalSignatureOn.opt.il.bsl b/...tureOn/ForEachRangeStepByte.fs.opt.il.bsl → ...yte.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...ernalSignatureOff/ForEachRangeStepChar.fs → ...EmittedIL/ForLoop/ForEachRangeStepChar.fs b/...ernalSignatureOff/ForEachRangeStepChar.fs → ...EmittedIL/ForLoop/ForEachRangeStepChar.fs
diff --git a/...ureOff/ForEachRangeStepChar.fs.opt.il.bsl → ...ar.fs.RealInternalSignatureOff.opt.il.bsl b/...ureOff/ForEachRangeStepChar.fs.opt.il.bsl → ...ar.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...tureOn/ForEachRangeStepChar.fs.opt.il.bsl → ...har.fs.RealInternalSignatureOn.opt.il.bsl b/...tureOn/ForEachRangeStepChar.fs.opt.il.bsl → ...har.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...rnalSignatureOff/ForEachRangeStepInt16.fs → ...mittedIL/ForLoop/ForEachRangeStepInt16.fs b/...rnalSignatureOff/ForEachRangeStepInt16.fs → ...mittedIL/ForLoop/ForEachRangeStepInt16.fs
diff --git a/...reOff/ForEachRangeStepInt16.fs.opt.il.bsl → ...16.fs.RealInternalSignatureOff.opt.il.bsl b/...reOff/ForEachRangeStepInt16.fs.opt.il.bsl → ...16.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...ureOn/ForEachRangeStepInt16.fs.opt.il.bsl → ...t16.fs.RealInternalSignatureOn.opt.il.bsl b/...ureOn/ForEachRangeStepInt16.fs.opt.il.bsl → ...t16.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...rnalSignatureOff/ForEachRangeStepInt32.fs → ...mittedIL/ForLoop/ForEachRangeStepInt32.fs b/...rnalSignatureOff/ForEachRangeStepInt32.fs → ...mittedIL/ForLoop/ForEachRangeStepInt32.fs
diff --git a/...reOff/ForEachRangeStepInt32.fs.opt.il.bsl → ...32.fs.RealInternalSignatureOff.opt.il.bsl b/...reOff/ForEachRangeStepInt32.fs.opt.il.bsl → ...32.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...ureOn/ForEachRangeStepInt32.fs.opt.il.bsl → ...t32.fs.RealInternalSignatureOn.opt.il.bsl b/...ureOn/ForEachRangeStepInt32.fs.opt.il.bsl → ...t32.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...rnalSignatureOff/ForEachRangeStepInt64.fs → ...mittedIL/ForLoop/ForEachRangeStepInt64.fs b/...rnalSignatureOff/ForEachRangeStepInt64.fs → ...mittedIL/ForLoop/ForEachRangeStepInt64.fs
diff --git a/...reOff/ForEachRangeStepInt64.fs.opt.il.bsl → ...64.fs.RealInternalSignatureOff.opt.il.bsl b/...reOff/ForEachRangeStepInt64.fs.opt.il.bsl → ...64.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...ureOn/ForEachRangeStepInt64.fs.opt.il.bsl → ...t64.fs.RealInternalSignatureOn.opt.il.bsl b/...ureOn/ForEachRangeStepInt64.fs.opt.il.bsl → ...t64.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...nalSignatureOff/ForEachRangeStepIntPtr.fs → ...ittedIL/ForLoop/ForEachRangeStepIntPtr.fs b/...nalSignatureOff/ForEachRangeStepIntPtr.fs → ...ittedIL/ForLoop/ForEachRangeStepIntPtr.fs
diff --git a/...eOff/ForEachRangeStepIntPtr.fs.opt.il.bsl → ...tr.fs.RealInternalSignatureOff.opt.il.bsl b/...eOff/ForEachRangeStepIntPtr.fs.opt.il.bsl → ...tr.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...reOn/ForEachRangeStepIntPtr.fs.opt.il.bsl → ...Ptr.fs.RealInternalSignatureOn.opt.il.bsl b/...reOn/ForEachRangeStepIntPtr.fs.opt.il.bsl → ...Ptr.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...rnalSignatureOff/ForEachRangeStepSByte.fs → ...mittedIL/ForLoop/ForEachRangeStepSByte.fs b/...rnalSignatureOff/ForEachRangeStepSByte.fs → ...mittedIL/ForLoop/ForEachRangeStepSByte.fs
diff --git a/...reOff/ForEachRangeStepSByte.fs.opt.il.bsl → ...te.fs.RealInternalSignatureOff.opt.il.bsl b/...reOff/ForEachRangeStepSByte.fs.opt.il.bsl → ...te.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...ureOn/ForEachRangeStepSByte.fs.opt.il.bsl → ...yte.fs.RealInternalSignatureOn.opt.il.bsl b/...ureOn/ForEachRangeStepSByte.fs.opt.il.bsl → ...yte.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...nalSignatureOff/ForEachRangeStepUInt16.fs → ...ittedIL/ForLoop/ForEachRangeStepUInt16.fs b/...nalSignatureOff/ForEachRangeStepUInt16.fs → ...ittedIL/ForLoop/ForEachRangeStepUInt16.fs
diff --git a/...eOff/ForEachRangeStepUInt16.fs.opt.il.bsl → ...16.fs.RealInternalSignatureOff.opt.il.bsl b/...eOff/ForEachRangeStepUInt16.fs.opt.il.bsl → ...16.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...reOn/ForEachRangeStepUInt16.fs.opt.il.bsl → ...t16.fs.RealInternalSignatureOn.opt.il.bsl b/...reOn/ForEachRangeStepUInt16.fs.opt.il.bsl → ...t16.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...nalSignatureOff/ForEachRangeStepUInt32.fs → ...ittedIL/ForLoop/ForEachRangeStepUInt32.fs b/...nalSignatureOff/ForEachRangeStepUInt32.fs → ...ittedIL/ForLoop/ForEachRangeStepUInt32.fs
diff --git a/...eOff/ForEachRangeStepUInt32.fs.opt.il.bsl → ...32.fs.RealInternalSignatureOff.opt.il.bsl b/...eOff/ForEachRangeStepUInt32.fs.opt.il.bsl → ...32.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...reOn/ForEachRangeStepUInt32.fs.opt.il.bsl → ...t32.fs.RealInternalSignatureOn.opt.il.bsl b/...reOn/ForEachRangeStepUInt32.fs.opt.il.bsl → ...t32.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...nalSignatureOff/ForEachRangeStepUInt64.fs → ...ittedIL/ForLoop/ForEachRangeStepUInt64.fs b/...nalSignatureOff/ForEachRangeStepUInt64.fs → ...ittedIL/ForLoop/ForEachRangeStepUInt64.fs
diff --git a/...eOff/ForEachRangeStepUInt64.fs.opt.il.bsl → ...64.fs.RealInternalSignatureOff.opt.il.bsl b/...eOff/ForEachRangeStepUInt64.fs.opt.il.bsl → ...64.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...reOn/ForEachRangeStepUInt64.fs.opt.il.bsl → ...t64.fs.RealInternalSignatureOn.opt.il.bsl b/...reOn/ForEachRangeStepUInt64.fs.opt.il.bsl → ...t64.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...alSignatureOff/ForEachRangeStepUIntPtr.fs → ...ttedIL/ForLoop/ForEachRangeStepUIntPtr.fs b/...alSignatureOff/ForEachRangeStepUIntPtr.fs → ...ttedIL/ForLoop/ForEachRangeStepUIntPtr.fs
diff --git a/...Off/ForEachRangeStepUIntPtr.fs.opt.il.bsl → ...tr.fs.RealInternalSignatureOff.opt.il.bsl b/...Off/ForEachRangeStepUIntPtr.fs.opt.il.bsl → ...tr.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...eOn/ForEachRangeStepUIntPtr.fs.opt.il.bsl → ...Ptr.fs.RealInternalSignatureOn.opt.il.bsl b/...eOn/ForEachRangeStepUIntPtr.fs.opt.il.bsl → ...Ptr.fs.RealInternalSignatureOn.opt.il.bsl
diff --git a/...ureOff/ForEachRangeStep_UnitsOfMeasure.fs → ...orLoop/ForEachRangeStep_UnitsOfMeasure.fs b/...ureOff/ForEachRangeStep_UnitsOfMeasure.fs → ...orLoop/ForEachRangeStep_UnitsOfMeasure.fs
diff --git a/...achRangeStep_UnitsOfMeasure.fs.opt.il.bsl → ...re.fs.RealInternalSignatureOff.opt.il.bsl b/...achRangeStep_UnitsOfMeasure.fs.opt.il.bsl → ...re.fs.RealInternalSignatureOff.opt.il.bsl
diff --git a/...achRangeStep_UnitsOfMeasure.fs.opt.il.bsl → ...ure.fs.RealInternalSignatureOn.opt.il.bsl b/...achRangeStep_UnitsOfMeasure.fs.opt.il.bsl → ...ure.fs.RealInternalSignatureOn.opt.il.bsl