dotnet · abonie · Feb 21, 2023 · Feb 15, 2023 · Feb 15, 2023 · Feb 16, 2023
@@ -444,6 +444,8 @@ stages:
           - checkout: self
             clean: true
           - script: ./eng/cibuild.sh --configuration $(_BuildConfig) --testcoreclr
+            env:
+              COMPlus_DefaultStackSize: 1000000
             displayName: Build / Test
           - task: PublishTestResults@2
             displayName: Publish Test Results

@@ -6970,17 +6970,22 @@ and TcConstStringExpr cenv (overallTy: OverallTy) env m tpenv (s: string) litera
         | _ -> false
 
     let g = cenv.g
+
 
-    if isFormat g overallTy.Commit then
-        if literalType = LiteralArgumentType.StaticField then
-            checkLanguageFeatureAndRecover g.langVersion LanguageFeature.NonInlineLiteralsAsPrintfFormat m
+    match isFormat g overallTy.Commit, literalType with
+    | true, LiteralArgumentType.StaticField ->
+        checkLanguageFeatureAndRecover g.langVersion LanguageFeature.NonInlineLiteralsAsPrintfFormat m
+        TcFormatStringExpr cenv overallTy env m tpenv s literalType
 
+    | true, LiteralArgumentType.Inline ->
         TcFormatStringExpr cenv overallTy env m tpenv s literalType
-    else
-        if literalType = LiteralArgumentType.Inline && not (isObjTy g overallTy.Commit) then
-            AddCxTypeEqualsType env.eContextInfo env.DisplayEnv cenv.css m overallTy.Commit g.string_ty
 
-        mkString g m s, tpenv
+    | false, LiteralArgumentType.StaticField ->
+        Expr.Const (TcFieldInit m (ILFieldInit.String s), m, g.string_ty), tpenv
+
+    | false, LiteralArgumentType.Inline ->
+        TcPropagatingExprLeafThenConvert cenv overallTy g.string_ty env (* true *) m (fun () ->
+                mkString g m s, tpenv)
 
 and TcFormatStringExpr cenv (overallTy: OverallTy) env m tpenv (fmtString: string) formatStringLiteralType =
     let g = cenv.g

@@ -5,8 +5,10 @@ namespace FSharp.Compiler.ComponentTests.Conformance.LexicalFiltering.Basic
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
+open FSharp.Test.Compiler.Assertions.StructuredResultsAsserts
 
 module OffsideExceptions =
+
     type FileAttribute(file) =
         inherit DirectoryAttribute(__SOURCE_DIRECTORY__, Includes=[|file|])
 

@@ -4,6 +4,7 @@ namespace FSharp.Compiler.ComponentTests.EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
+open FSharp.Test.Compiler.Assertions.StructuredResultsAsserts
 
 module Enums =
 

@@ -4,6 +4,7 @@ namespace FSharp.Compiler.ComponentTests.EmittedIL
 
 open Xunit
 open FSharp.Test.Compiler
+open FSharp.Test.Compiler.Assertions.StructuredResultsAsserts
 
 module ``Literals`` =
 

@@ -4,6 +4,7 @@ namespace FSharp.Compiler.ComponentTests.ErrorMessages
 
 open Xunit
 open FSharp.Test.Compiler
+open FSharp.Test.Compiler.Assertions.StructuredResultsAsserts
 
 module ``Unsupported Attributes`` =
 

@@ -227,6 +227,10 @@
     <Compile Include="Miscellaneous\ListLiterals.fs" />
     <Compile Include="Miscellaneous\SemanticClassificationKeyBuilder.fs" />
     <Compile Include="Miscellaneous\XmlDoc.fs" />
+    <Compile Include="Miscellaneous\FsharpSuiteMigrated.fs" />
+    <Compile Include="Miscellaneous\MigratedCoreTests.fs" />
+    <Compile Include="Miscellaneous\MigratedOverloadTests.fs" />
+    <Compile Include="Miscellaneous\MigratedTypeCheckTests.fs" />
     <Compile Include="Miscellaneous\GraphTests.fs" />
     <Compile Include="Signatures\TestHelpers.fs" />
     <Compile Include="Signatures\ModuleOrNamespaceTests.fs" />

@@ -4,6 +4,7 @@ module FSharp.Compiler.ComponentTests.Language.PrintfFormatTests
 
 open Xunit
 open FSharp.Test.Compiler
+open StructuredResultsAsserts
 
 [<Fact>]
 let ``Constant defined in C# can be used as printf format``() =
@@ -32,7 +33,7 @@ module PrintfFormatTests
 [<Literal>]
 let Format = "%d"
 
-if sprintf Format Format.Length <> "2" then
+if sprintf Format (Format.Length) <> "2" then
     failwith "failed"
     """
     |> withLangVersionPreview

@@ -4,10 +4,10 @@ module FSharp.Compiler.ComponentTests.Language.SequenceExpressionTests
 
 open Xunit
 open FSharp.Test.Compiler
+open FSharp.Test.ScriptHelpers
 
 
-
-let fsiSession = getSessionForEval()
+let fsiSession = getSessionForEval [||] LangVersion.Preview
 
 let runCode = evalInSharedSession fsiSession
 

@@ -0,0 +1,166 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace FSharp.Compiler.ComponentTests.Miscellaneous.FsharpSuiteMigrated
+
+open System
+open System.IO
+open Xunit
+open FSharp.Test
+open FSharp.Test.Compiler
+open FSharp.Test.ScriptHelpers 
+
+
+
+module Configuration = 
+    let supportedNames = set ["testlib.fsi";"testlib.fs";"test.mli";"test.ml";"test.fsi";"test.fs";"test2.fsi";"test2.fs";"test.fsx";"test2.fsx"]
+
+module ScriptRunner = 
+    open Internal.Utilities.Library
+
+    let private createEngine(args,version) = 
+        getSessionForEval args version
+
+    let defaultDefines = 
+        [ 
+#if NETCOREAPP
+          "NETCOREAPP"
+#endif
+        ]
+
+    let runScriptFile version (cu:CompilationUnit)  =
+        let cu  = cu |> withDefines defaultDefines
+        match cu with 
+        | FS fsSource ->
+            File.Delete("test.ok")           
+            let engine = createEngine (fsSource.Options |> Array.ofList,version)
+            let res = evalScriptFromDiskInSharedSession engine cu
+            match res with
+            | CompilationResult.Failure _ -> res
+            | CompilationResult.Success s -> 
+                if File.Exists("test.ok") then
+                    res
+                else
+                    failwith $"Results looked correct, but 'test.ok' file was not created. Result: %A{s}"       
+
+        | _ -> failwith $"Compilation unit other than fsharp is not supported, cannot process %A{cu}"
+
+/// This test file was created by porting over (slower) FsharpSuite.Tests
+/// In order to minimize human error, the test definitions have been copy-pasted and this adapter provides implementations of the test functions
+module TestFrameworkAdapter = 
+    open FSharp.Test.Compiler.Assertions.TextBasedDiagnosticAsserts
+
+    type ExecutionMode = 
+        | FSC_DEBUG 
+        | FSC_OPTIMIZED 
+        | FSI
+        | COMPILED_EXE_APP
+        | NEG_TEST_BUILD of testName:string
+
+    let baseFolder = Path.Combine(__SOURCE_DIRECTORY__,"..","..","fsharp") |> Path.GetFullPath      
+
+    let diffNegativeBaseline (cr:CompilationUnit) absFolder testName _version  =
+        let expectedFiles = Directory.GetFiles(absFolder, testName + ".*")
+        let baselines = 
+            [ for f in expectedFiles do
+                match Path.GetExtension(f) with
+                | ".bsl" -> cr, f
+                | ".vsbsl" -> cr |> withOptions ["--test:ContinueAfterParseFailure"], f
+                | _ -> () ]
+        [ for compilationUnit,baseline in baselines do
+            compilationUnit       
+            |> typecheck
+            |> withResultsMatchingFile baseline ]
+        |> List.head
+
+
+    let adjustVersion version bonusArgs = 
+        match version with 
+        | LangVersion.V47 -> "4.7",bonusArgs
+        | LangVersion.V50 -> "5.0",bonusArgs
+        | LangVersion.V60 -> "6.0",bonusArgs
+        | LangVersion.V70 -> "7.0",bonusArgs
+        | LangVersion.Preview -> "preview",bonusArgs
+        | LangVersion.Latest  -> "latest", bonusArgs
+        | LangVersion.SupportsMl -> "5.0",  "--mlcompatibility" :: bonusArgs       
+
+
+    let singleTestBuildAndRunAuxVersion (folder:string) bonusArgs mode langVersion = 
+        let absFolder = Path.Combine(baseFolder,folder)
+        let supportedNames, files = 
+            match mode with 
+            | NEG_TEST_BUILD testName -> 
+                let nameSet = 
+                    Configuration.supportedNames
+                        .Add(testName+".fsx")
+                        .Add(testName+".fs")
+                        .Add(testName+".fsi")
+                        .Add(testName+"-pre.fs")
+                let files = Directory.GetFiles(absFolder,"*.fs*") |> Array.filter(fun n -> nameSet.Contains(Path.GetFileName(n)))
+                nameSet, files
+            | _ -> Configuration.supportedNames, Directory.GetFiles(absFolder,"test*.fs*")
+
+        let mainFile,otherFiles = 
+            match files.Length with
+            | 0 -> Directory.GetFiles(absFolder,"*.ml") |> Array.exactlyOne, [||]
+            | 1 -> files |> Array.exactlyOne, [||]
+            | _ -> 
+                let mainFile,dependencies = 
+                    files 
+                    |> Array.filter (fun n -> supportedNames.Contains(Path.GetFileName(n))) 
+                     // Convention in older FsharpSuite: test2 goes last, longer names like testlib before test, .fsi before .fs on equal filenames
+                    |> Array.sortBy (fun n -> n.Contains("test2"), -n.IndexOf('.'), n.EndsWith(".fsi") |> not)                  
+                    |> Array.splitAt 1        
+
+                mainFile[0],dependencies
+
+        let version,bonusArgs = adjustVersion langVersion bonusArgs
+
+        FsFromPath mainFile
+        |> withAdditionalSourceFiles [for f in otherFiles -> SourceFromPath f]
+        |> withLangVersion version
+        |> fun cu -> 
+            match mode with
+            | FSC_DEBUG | FSC_OPTIMIZED | FSI | COMPILED_EXE_APP -> 
+                cu 
+                |> ignoreWarnings 
+                |> withOptions (["--nowarn:0988;3370"] @ bonusArgs) 
+            | NEG_TEST_BUILD _ -> 
+                cu |> 
+                withOptions (["--vserrors";"--maxerrors:10000";"--warnaserror";"--warn:3";"--nowarn:20;21;1178;52"] @ bonusArgs) 
+        |> fun cu -> 
+            match mode with
+            | FSC_DEBUG -> 
+                cu 
+                |> withDebug 
+                |> withNoOptimize  
+                |> ScriptRunner.runScriptFile langVersion 
+                |> shouldSucceed 
+            | FSC_OPTIMIZED -> 
+                cu 
+                |> withOptimize 
+                |> withNoDebug 
+                |> ScriptRunner.runScriptFile langVersion 
+                |> shouldSucceed 
+            | FSI -> 
+                cu 
+                |> ScriptRunner.runScriptFile langVersion 
+                |> shouldSucceed 
+            | COMPILED_EXE_APP -> 
+                cu 
+                |> withDefines ("TESTS_AS_APP" :: ScriptRunner.defaultDefines) 
+                |> compileExeAndRun 
+                |> shouldSucceed 
+            | NEG_TEST_BUILD testName -> diffNegativeBaseline (cu |> withName mainFile) absFolder testName langVersion
+
+        |> ignore<CompilationResult>
+
+
+    let singleTestBuildAndRunAux folder bonusArgs mode = singleTestBuildAndRunAuxVersion folder bonusArgs mode LangVersion.Latest
+    let singleTestBuildAndRunVersion folder mode version = singleTestBuildAndRunAuxVersion folder [] mode version
+    let singleTestBuildAndRun folder mode = singleTestBuildAndRunVersion folder mode LangVersion.Latest
+
+    let singleVersionedNegTestAux folder bonusArgs version testName =
+        singleTestBuildAndRunAuxVersion folder bonusArgs  (NEG_TEST_BUILD testName) version
+    let singleVersionedNegTest (folder:string)  (version:LangVersion) (testName:string) = 
+        singleVersionedNegTestAux folder [] version testName
+    let singleNegTest folder testName = singleVersionedNegTest folder LangVersion.Latest testName