merge

dsyme · dsyme · commit e5623a308091 · 2021-06-07T13:02:05.000+01:00
diff --git a/src/fsharp/IlxGen.fs b/src/fsharp/IlxGen.fs
@@ -2411,13 +2411,16 @@ and GenExprPreSteps (cenv: cenv) (cgbuf: CodeGenBuffer) eenv sp expr sequel =
 
     match LowerStateMachineExpr cenv.g expr with
     | LoweredStateMachineResult.Lowered res ->
+        checkLanguageFeatureError cenv.g.langVersion LanguageFeature.ResumableStateMachines expr.Range
         GenStructStateMachine cenv cgbuf eenv res sequel
         true
     | LoweredStateMachineResult.UseAlternative (msg, altExpr) ->
+        checkLanguageFeatureError cenv.g.langVersion LanguageFeature.ResumableStateMachines expr.Range
         warning(Error(FSComp.SR.reprStateMachineNotCompilable(msg), expr.Range))
         GenExpr cenv cgbuf eenv sp altExpr sequel
         true
     | LoweredStateMachineResult.NoAlternative msg ->
+        checkLanguageFeatureError cenv.g.langVersion LanguageFeature.ResumableStateMachines expr.Range
         errorR(Error(FSComp.SR.reprStateMachineNotCompilableNoAlternative(msg), expr.Range))
         GenDefaultValue cenv cgbuf eenv (tyOfExpr cenv.g expr, expr.Range)
         true
diff --git a/tests/fsharp/Compiler/CodeGen/EmittedIL/ComputedListExpressions.fs b/tests/fsharp/Compiler/CodeGen/EmittedIL/ComputedListExpressions.fs
diff --git a/tests/fsharp/Compiler/CodeGen/EmittedIL/TaskGeneratedCode.fs b/tests/fsharp/Compiler/CodeGen/EmittedIL/TaskGeneratedCode.fs
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000270 Length: 0x000000AF
 }
 .module ListExpressionSteppingTest1.exe
-// MVID: {60BCC37B-50CF-F6CE-A745-03837BC3BC60}
+// MVID: {60B78A57-50CF-F6CE-A745-0383578AB760}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x06E70000
+// Image base: 0x07190000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000270 Length: 0x000000AF
 }
 .module ListExpressionSteppingTest2.exe
-// MVID: {60BCC37B-D3DE-B780-A745-03837BC3BC60}
+// MVID: {60B78A57-D3DE-B780-A745-0383578AB760}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x06A70000
+// Image base: 0x094E0000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000280 Length: 0x000000AF
 }
 .module ListExpressionSteppingTest3.exe
-// MVID: {60BCC37B-AE45-39B4-A745-03837BC3BC60}
+// MVID: {60B78A57-AE45-39B4-A745-0383578AB760}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x07190000
+// Image base: 0x06EB0000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000270 Length: 0x000000AF
 }
 .module ListExpressionSteppingTest4.exe
-// MVID: {60BCC37B-3154-FA67-A745-03837BC3BC60}
+// MVID: {60B78A57-3154-FA67-A745-0383578AB760}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x07150000
+// Image base: 0x06700000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000270 Length: 0x000000AF
 }
 .module ListExpressionSteppingTest5.exe
-// MVID: {60BD414B-CBE3-BFEA-A745-03834B41BD60}
+// MVID: {60B78A57-CBE3-BFEA-A745-0383578AB760}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x07210000
+// Image base: 0x06C00000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AnonRecd.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AnonRecd.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x000001C8 Length: 0x0000006B
 }
 .module AnonRecd.exe
-// MVID: {60BD4553-C42F-5208-A745-03835345BD60}
+// MVID: {60B68B7F-C42F-5208-A745-03837F8BB660}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x053D0000
+// Image base: 0x05160000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000268 Length: 0x000000AD
 }
 .module SeqExpressionSteppingTest1.exe
-// MVID: {60BD414C-2432-947D-A745-03834C41BD60}
+// MVID: {60B78A59-2432-947D-A745-0383598AB760}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x06860000
+// Image base: 0x06A30000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000268 Length: 0x000000AD
 }
 .module SeqExpressionSteppingTest2.exe
-// MVID: {60BD414C-2432-951E-A745-03834C41BD60}
+// MVID: {60B78A59-2432-951E-A745-0383598AB760}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x06C70000
+// Image base: 0x06BF0000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000278 Length: 0x000000AD
 }
 .module SeqExpressionSteppingTest3.exe
-// MVID: {60BD414C-2432-943F-A745-03834C41BD60}
+// MVID: {60B78A59-2432-943F-A745-0383598AB760}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x06980000
+// Image base: 0x065D0000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000268 Length: 0x000000AD
 }
 .module SeqExpressionSteppingTest4.exe
-// MVID: {60BD414C-2432-93E0-A745-03834C41BD60}
+// MVID: {60B78A59-2432-93E0-A745-0383598AB760}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x067D0000
+// Image base: 0x06580000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000680 Length: 0x000001D9
 }
 .module SteppingMatch06.dll
-// MVID: {60BD455B-4FAE-FD21-A745-03835B45BD60}
+// MVID: {60B68B90-4FAE-FD21-A745-0383908BB660}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x07120000
+// Image base: 0x05BB0000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl
@@ -36,13 +36,13 @@
   // Offset: 0x00000680 Length: 0x000001D9
 }
 .module SteppingMatch07.dll
-// MVID: {60BD455B-D373-07F3-A745-03835B45BD60}
+// MVID: {60B68B90-D373-07F3-A745-0383908BB660}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x05B50000
+// Image base: 0x07270000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnArray01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnArray01.il.bsl
@@ -1,5 +1,5 @@
 
-//  Microsoft (R) .NET Framework IL Disassembler.  Version 4.8.3928.0
+//  Microsoft (R) .NET Framework IL Disassembler.  Version 4.6.1055.0
 //  Copyright (c) Microsoft Corporation.  All rights reserved.
 
 
@@ -13,7 +13,7 @@
 .assembly extern FSharp.Core
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )                         // .?_....:
-  .ver 5:0:0:0
+  .ver 4:4:1:0
 }
 .assembly ForEachOnArray01
 {
@@ -29,20 +29,20 @@
 }
 .mresource public FSharpSignatureData.ForEachOnArray01
 {
-  // Offset: 0x00000000 Length: 0x000001DC
+  // Offset: 0x00000000 Length: 0x000001E0
 }
 .mresource public FSharpOptimizationData.ForEachOnArray01
 {
-  // Offset: 0x000001E0 Length: 0x0000007C
+  // Offset: 0x000001E8 Length: 0x0000007C
 }
 .module ForEachOnArray01.dll
-// MVID: {60BE0580-7E2E-D3AE-A745-03838005BE60}
+// MVID: {59B18AEE-7E2E-D3AE-A745-0383EE8AB159}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x05490000
+// Image base: 0x00D00000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
@@ -59,7 +59,7 @@
              [1] int32 V_1,
              [2] int32 x)
     .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}'
-    .line 6,6 : 6,23 'C:\\GitHub\\dsyme\\fsharp\\tests\\fsharpqa\\source\\Optimizations\\ForLoop\\ForEachOnArray01.fs'
+    .line 6,6 : 6,23 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\Optimizations\\ForLoop\\ForEachOnArray01.fs'
     IL_0000:  ldc.i4.0
     IL_0001:  stloc.0
     .line 7,7 : 6,21 ''
diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnList01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnList01.il.bsl
@@ -41,13 +41,13 @@
   // Offset: 0x000002F0 Length: 0x000000DB
 }
 .module ForEachOnList01.dll
-// MVID: {60BE0580-56DF-F74F-A745-03838005BE60}
+// MVID: {5FCFFFA6-56DF-F74F-A745-0383A6FFCF5F}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x05400000
+// Image base: 0x072F0000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnString01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnString01.il.bsl
@@ -41,13 +41,13 @@
   // Offset: 0x00000358 Length: 0x000000FF
 }
 .module ForEachOnString01.dll
-// MVID: {60BE0580-105C-852B-A745-03838005BE60}
+// MVID: {5FCFFFA6-105C-852B-A745-0383A6FFCF5F}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x06980000
+// Image base: 0x06C70000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoAllocationOfTuple01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoAllocationOfTuple01.il.bsl
@@ -1,5 +1,5 @@
 
-//  Microsoft (R) .NET Framework IL Disassembler.  Version 4.8.3928.0
+//  Microsoft (R) .NET Framework IL Disassembler.  Version 4.6.1055.0
 //  Copyright (c) Microsoft Corporation.  All rights reserved.
 
 
@@ -13,7 +13,7 @@
 .assembly extern FSharp.Core
 {
   .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )                         // .?_....:
-  .ver 5:0:0:0
+  .ver 4:4:1:0
 }
 .assembly NoAllocationOfTuple01
 {
@@ -29,20 +29,20 @@
 }
 .mresource public FSharpSignatureData.NoAllocationOfTuple01
 {
-  // Offset: 0x00000000 Length: 0x000001DC
+  // Offset: 0x00000000 Length: 0x000001E0
 }
 .mresource public FSharpOptimizationData.NoAllocationOfTuple01
 {
-  // Offset: 0x000001E0 Length: 0x00000085
+  // Offset: 0x000001E8 Length: 0x00000085
 }
 .module NoAllocationOfTuple01.dll
-// MVID: {60BE0580-13B5-F699-A745-03838005BE60}
+// MVID: {59B18AEE-13B5-F699-A745-0383EE8AB159}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x05100000
+// Image base: 0x03460000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
@@ -60,7 +60,7 @@
              [2] int32 V_2,
              [3] int32 j)
     .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}'
-    .line 6,6 : 5,31 'C:\\GitHub\\dsyme\\fsharp\\tests\\fsharpqa\\source\\Optimizations\\ForLoop\\NoAllocationOfTuple01.fs'
+    .line 6,6 : 5,31 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\Optimizations\\ForLoop\\NoAllocationOfTuple01.fs'
     IL_0000:  ldarg.0
     IL_0001:  call       !!0[] [FSharp.Core]Microsoft.FSharp.Collections.ArrayModule::ZeroCreate<int32>(int32)
     IL_0006:  stloc.0
diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable01.il.bsl
@@ -34,20 +34,20 @@
 }
 .mresource public FSharpSignatureData.NoIEnumerable01
 {
-  // Offset: 0x00000000 Length: 0x000001CD
+  // Offset: 0x00000000 Length: 0x000001CB
 }
 .mresource public FSharpOptimizationData.NoIEnumerable01
 {
-  // Offset: 0x000001D8 Length: 0x0000006C
+  // Offset: 0x000001D0 Length: 0x0000006C
 }
 .module NoIEnumerable01.dll
-// MVID: {60BE0580-31A1-8DCB-A745-03838005BE60}
+// MVID: {5F1FBE49-31A1-8DCB-A745-038349BE1F5F}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x06780000
+// Image base: 0x07010000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
@@ -64,7 +64,7 @@
              [1] int32 i,
              [2] class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4<class [FSharp.Core]Microsoft.FSharp.Core.Unit,class [mscorlib]System.IO.TextWriter,class [FSharp.Core]Microsoft.FSharp.Core.Unit,class [FSharp.Core]Microsoft.FSharp.Core.Unit> V_2)
     .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}'
-    .line 7,7 : 4,22 'C:\\GitHub\\dsyme\\fsharp\\tests\\fsharpqa\\source\\Optimizations\\ForLoop\\NoIEnumerable01.fsx'
+    .line 7,7 : 4,22 'C:\\kevinransom\\fsharp\\tests\\fsharpqa\\source\\Optimizations\\ForLoop\\NoIEnumerable01.fsx'
     IL_0000:  ldc.i4.1
     IL_0001:  stloc.1
     IL_0002:  ldarg.0
diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable02.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable02.il.bsl
diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable03.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable03.il.bsl
diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength01.il.bsl
diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength02.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength02.il.bsl
