Merge feature/auto-widen to feature/erased-unions

eng/Version.Details.xml

@@ -8,9 +8,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21321.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21328.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>28a6403ee97077256fcdc60f599f0ad9e38e3cfa</Sha>
+      <Sha>685c1a4fa207d81e881a402a32ffa1c0fb191b42</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>

eng/common/tools.ps1

@@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
   }
 
   $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
-  return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
+
+  $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
+  $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
+  if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
+    $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
+  } else {
+    $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
+  }
+
+  return $global:_MSBuildExe
 }
 
 function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {

global.json

@@ -13,7 +13,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.2",
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21328.2",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
   }
 }

src/fsharp/CheckExpressions.fs

@@ -6906,28 +6906,38 @@ and TcInterpolatedStringExpr cenv (overallTy: OverallTy) env m tpenv (parts: Syn
         UnifyTypes cenv env m printerTupleTy printerTupleTyRequired
 
         // Type check the expressions filling the holes
-        let flexes = argTys |> List.map (fun _ -> false)
-        let fillExprs, tpenv = TcExprsWithFlexes cenv env m tpenv flexes argTys synFillExprs
 
-        let fillExprsBoxed = (argTys, fillExprs) ||> List.map2 (mkCallBox g m)
+        if List.isEmpty synFillExprs then
+            let str = mkString g m printfFormatString
 
-        let argsExpr = mkArray (g.obj_ty, fillExprsBoxed, m)
-        let percentATysExpr =
-            if percentATys.Length = 0 then
-                mkNull m (mkArrayType g g.system_Type_ty)
+            if isString then
+                str, tpenv
             else
-                let tyExprs = percentATys |> Array.map (mkCallTypeOf g m) |> Array.toList
-                mkArray (g.system_Type_ty, tyExprs, m)
+                mkCallNewFormat cenv.g m printerTy printerArgTy printerResidueTy printerResultTy printerTupleTy str, tpenv
+        else
+            // Type check the expressions filling the holes
+            let flexes = argTys |> List.map (fun _ -> false)
+            let fillExprs, tpenv = TcExprsWithFlexes cenv env m tpenv flexes argTys synFillExprs
 
-        let fmtExpr = MakeMethInfoCall cenv.amap m newFormatMethod [] [mkString g m printfFormatString; argsExpr; percentATysExpr]
+            let fillExprsBoxed = (argTys, fillExprs) ||> List.map2 (mkCallBox g m)
 
-        if isString then
-            TcPropagatingExprLeafThenConvert cenv overallTy g.string_ty env (* true *) m (fun () ->
-                // Make the call to sprintf
-                mkCall_sprintf g m printerTy fmtExpr [], tpenv
-            )
-        else
-            fmtExpr, tpenv
+            let argsExpr = mkArray (g.obj_ty, fillExprsBoxed, m)
+            let percentATysExpr =
+                if percentATys.Length = 0 then
+                    mkNull m (mkArrayType g g.system_Type_ty)
+                else
+                    let tyExprs = percentATys |> Array.map (mkCallTypeOf g m) |> Array.toList
+                    mkArray (g.system_Type_ty, tyExprs, m)
+
+            let fmtExpr = MakeMethInfoCall cenv.amap m newFormatMethod [] [mkString g m printfFormatString; argsExpr; percentATysExpr]
+
+            if isString then
+                TcPropagatingExprLeafThenConvert cenv overallTy g.string_ty env (* true *) m (fun () ->
+                    // Make the call to sprintf
+                    mkCall_sprintf g m printerTy fmtExpr [], tpenv
+                )
+            else
+                fmtExpr, tpenv
 
     // The case for $"..." used as type FormattableString or IFormattable
     | Choice2Of2 createFormattableStringMethod ->

src/fsharp/CompilerConfig.fs

@@ -270,6 +270,11 @@ type LStatus =
     | Unprocessed
     | Processed
 
+type TokenizeOption =
+    | AndCompile
+    | Only
+    | Unfiltered
+
 type PackageManagerLine =
     { Directive: Directive
       LineStatus: LStatus
@@ -367,7 +372,7 @@ type TcConfigBuilder =
       mutable importAllReferencesOnly: bool
       mutable simulateException: string option
       mutable printAst: bool
-      mutable tokenizeOnly: bool
+      mutable tokenize: TokenizeOption
       mutable testInteractionParser: bool
       mutable reportNumDecls: bool
       mutable printSignature: bool
@@ -573,7 +578,7 @@ type TcConfigBuilder =
           importAllReferencesOnly = false
           simulateException = None
           printAst = false
-          tokenizeOnly = false
+          tokenize = TokenizeOption.AndCompile
           testInteractionParser = false
           reportNumDecls = false
           printSignature = false
@@ -960,7 +965,7 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
     member x.simulateException = data.simulateException
     member x.printAst = data.printAst
     member x.targetFrameworkVersion = targetFrameworkVersionValue
-    member x.tokenizeOnly = data.tokenizeOnly
+    member x.tokenize = data.tokenize
     member x.testInteractionParser = data.testInteractionParser
     member x.reportNumDecls = data.reportNumDecls
     member x.printSignature = data.printSignature

src/fsharp/CompilerConfig.fsi

@@ -121,6 +121,11 @@ type LStatus =
     | Unprocessed
     | Processed
 
+type TokenizeOption =
+    | AndCompile
+    | Only
+    | Unfiltered
+
 type PackageManagerLine =
     { Directive: Directive
       LineStatus: LStatus
@@ -182,7 +187,7 @@ type TcConfigBuilder =
       mutable importAllReferencesOnly: bool
       mutable simulateException: string option
       mutable printAst: bool
-      mutable tokenizeOnly: bool
+      mutable tokenize: TokenizeOption
       mutable testInteractionParser: bool
       mutable reportNumDecls: bool
       mutable printSignature: bool
@@ -374,7 +379,7 @@ type TcConfig =
     member importAllReferencesOnly: bool
     member simulateException: string option
     member printAst: bool
-    member tokenizeOnly: bool
+    member tokenize: TokenizeOption
     member testInteractionParser: bool
     member reportNumDecls: bool
     member printSignature: bool

src/fsharp/CompilerOptions.fs

@@ -1139,9 +1139,14 @@ let internalFlags (tcConfigB:TcConfigBuilder) =
 
     CompilerOption
        ("tokenize", tagNone,
-        OptionUnit (fun () -> tcConfigB.tokenizeOnly <- true),
+        OptionUnit (fun () -> tcConfigB.tokenize <- TokenizeOption.Only),
         Some(InternalCommandLineOption("--tokenize", rangeCmdArgs)), None)
 
+    CompilerOption
+       ("tokenize-unfiltered", tagNone,
+        OptionUnit (fun () -> tcConfigB.tokenize <- TokenizeOption.Unfiltered),
+        Some(InternalCommandLineOption("--tokenize-unfiltered", rangeCmdArgs)), None)
+
     CompilerOption
        ("testInteractionParser", tagNone,
         OptionUnit (fun () -> tcConfigB.testInteractionParser <- true),

src/fsharp/DependencyManager/NativeDllResolveHandler.fs

@@ -111,25 +111,26 @@ type NativeDllResolveHandler (nativeProbingRoots: NativeResolutionProbe) =
         else
             None
 
-    let appendSemiColon (p: string) =
-        if not(p.EndsWith(";", StringComparison.OrdinalIgnoreCase)) then
-            p + ";"
+    let appendPathSeparator (p: string) =
+        let separator = string System.IO.Path.PathSeparator
+        if not(p.EndsWith(separator, StringComparison.OrdinalIgnoreCase)) then
+            p + separator
         else
             p
 
     let addedPaths = ConcurrentBag<string>()
 
     let addProbeToProcessPath probePath =
-        let probe = appendSemiColon probePath
-        let path = appendSemiColon (Environment.GetEnvironmentVariable("PATH"))
+        let probe = appendPathSeparator probePath
+        let path = appendPathSeparator (Environment.GetEnvironmentVariable("PATH"))
         if not (path.Contains(probe)) then
             Environment.SetEnvironmentVariable("PATH", path + probe)
             addedPaths.Add probe
 
     let removeProbeFromProcessPath probePath =
         if not(String.IsNullOrWhiteSpace(probePath)) then
-            let probe = appendSemiColon probePath
-            let path = appendSemiColon (Environment.GetEnvironmentVariable("PATH"))
+            let probe = appendPathSeparator probePath
+            let path = appendPathSeparator (Environment.GetEnvironmentVariable("PATH"))
             if path.Contains(probe) then Environment.SetEnvironmentVariable("PATH", path.Replace(probe, ""))
 
     member internal _.RefreshPathsInEnvironment(roots: string seq) =

src/fsharp/DetupleArgs.fs

@@ -715,15 +715,15 @@ let fixupApp (penv: penv) (fx, fty, tys, args, m) =
 
     // Is it a val app, where the val has a transform? 
     match fx with
-    | Expr.Val (vref, _, m) -> 
+    | Expr.Val (vref, _, vm) -> 
         let f = vref.Deref
         match hasTransfrom penv f with
         | Some trans -> 
             // fix it 
             let callPattern       = trans.transformCallPattern 
             let transformedVal       = trans.transformedVal         
             let fCty     = transformedVal.Type
-            let fCx      = exprForVal m transformedVal
+            let fCx      = exprForVal vm transformedVal
             (* [[f tps args ]] -> transformedVal tps [[COLLAPSED: args]] *)
             let env      = {prefix = "arg";m = m;eg=penv.g}
             let bindings = []

src/fsharp/FSComp.txt

@@ -1233,6 +1233,7 @@ featureExpandedMeasurables,"more types support units of measure"
 featurePrintfBinaryFormat,"binary formatting for integers"
 featureDiscardUseValue,"discard pattern in use binding"
 featureNonVariablePatternsToRightOfAsPatterns,"non-variable patterns to the right of 'as' patterns"
+featureAttributesToRightOfModuleKeyword,"attributes to the right of the 'module' keyword"
 3090,tcIfThenElseMayNotBeUsedWithinQueries,"An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead."
 3091,ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen,"Invalid argument to 'methodhandleof' during codegen"
 3092,etProvidedTypeReferenceMissingArgument,"A reference to a provided type was missing a value for the static parameter '%s'. You may need to recompile one or more referenced assemblies."

src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -112,18 +112,6 @@
     <Compile Include="..\LanguageFeatures.fs">
       <Link>Facilities\LanguageFeatures.fs</Link>
     </Compile>
-    <Compile Include="..\utils\prim-lexing.fsi">
-      <Link>LexYaccRuntime\prim-lexing.fsi</Link>
-    </Compile>
-    <Compile Include="..\utils\prim-lexing.fs">
-      <Link>LexYaccRuntime\prim-lexing.fs</Link>
-    </Compile>
-    <Compile Include="..\utils\prim-parsing.fsi">
-      <Link>LexYaccRuntime\prim-parsing.fsi</Link>
-    </Compile>
-    <Compile Include="..\utils\prim-parsing.fs">
-      <Link>LexYaccRuntime\prim-parsing.fs</Link>
-    </Compile>
     <Compile Include="..\utils\ResizeArray.fsi">
       <Link>Utilities\ResizeArray.fsi</Link>
     </Compile>
@@ -202,6 +190,12 @@
     <Compile Include="..\lib.fs">
       <Link>Utilities\lib.fs</Link>
     </Compile>
+    <Compile Include="..\block.fsi">
+      <Link>Utilities\block.fsi</Link>
+    </Compile>
+    <Compile Include="..\block.fs">
+      <Link>Utilities\block.fs</Link>
+    </Compile>
     <Compile Include="..\rational.fsi">
       <Link>Utilities\rational.fsi</Link>
     </Compile>
@@ -247,6 +241,18 @@
     <Compile Include="..\ErrorResolutionHints.fs">
       <Link>ErrorLogging\ErrorResolutionHints.fs</Link>
     </Compile>
+    <Compile Include="..\utils\prim-lexing.fsi">
+      <Link>LexYaccRuntime\prim-lexing.fsi</Link>
+    </Compile>
+    <Compile Include="..\utils\prim-lexing.fs">
+      <Link>LexYaccRuntime\prim-lexing.fs</Link>
+    </Compile>
+    <Compile Include="..\utils\prim-parsing.fsi">
+      <Link>LexYaccRuntime\prim-parsing.fsi</Link>
+    </Compile>
+    <Compile Include="..\utils\prim-parsing.fs">
+      <Link>LexYaccRuntime\prim-parsing.fs</Link>
+    </Compile>
     <FsLex Include="..\absil\illex.fsl">
       <OtherFlags>--unicode --lexlib Internal.Utilities.Text.Lexing</OtherFlags>
       <Link>AbsIL\illex.fsl</Link>

src/fsharp/FSharp.Core/quotations.fs

@@ -1856,7 +1856,7 @@ module Patterns =
                          |> List.iter (fun (resourceName, defns) ->
                              defns |> List.iter (fun (methodBase, exprBuilder) ->
                                 reflectedDefinitionTable.[ReflectedDefinitionTableKey.GetKey methodBase] <- Entry exprBuilder)
-                             decodedTopResources.Add((assem, resourceName), 0))
+                             decodedTopResources.[(assem, resourceName)] <- 0)
                      // we know it's in the table now, if it's ever going to be there
                      reflectedDefinitionTable.TryGetValue key
                 )